Made a bunch of time fixes. Finally.
Merge pull request #5 from bencalegari/time_fixes

Made a bunch of time fixes. Finally.