Better timestamps, more code refactored