fixes time checking, misc other changes