fixing time stuff