DatePicker fix and other stuff I had lying around