fixes to time checking