cleaned up, changed timestamp stuff