Fix timestamping and make things a bit prettier