Benadryl is a good suggestion. I always make sure it's in my medicine cabinet, I too find that it can help with the edginess and provide some mild help with sleeping problems.