Clean up verbose & duplicated timestamp creations
Marking starred
Merge branch 'master' into bugs
Merge entries