shorter timestamp
entitys will be marked as dead
small changes
merge and cleanup