Removed underscore, improved date&time handling