changes for validation and date/time handling