Fixed timestamp issues
Cleanup