TimeKeeper Fixed

The TimeKeeper has be made to be more accurate. This, however, should be
a temporary solution. Certainly there is a better solution than this!