updated timekeeping
restarted work on generator towards demo