Fixes and added timepicker.