Date Bug fix and error message on add/edit