time update and bug fixes