fix and improve time things