Clean up a bit, fix timestamp