fixed some weird time problems