refactored normalize, added Timestamp.import, cleanups