fixed timepicker.  I now need to copy these changes to the time_bug branch.