editable dateTime and some other refactorings