Cleaned up some. Possible fix for "Sometimes a store gets 0 duration even though the timer was on."
Bug on loading data for the first time