fixed some time issues