Fixes and cleanups.
Merge pull request #625 from tobeytailor/timeline

Several fixes and cleanups, mostly to fix Zombotron issues