another large update with corrections and merging
Various closely similar concepts are merged
removed timestamp: can we use commit-time instead?