Revised the todo list to remind me later.
Fixed the glitch with negative timestamps.
Merge branch 'master' into gh-pages