fixed some things, added datepicker