update timepicker
clean up
updated with date fix