Update notification window logic

Change logic for determining if the 2-3 hour notification window has expired. Add comments.