Finalize date format management and some other refinements