fixed Timekeeper bugs