date format + minor fixes