fixed some minor time issues