Update TODO
Introduce event timestamp column
Update TODO
Update TODO, cosmetical cleanups