Fixed some notices that logging caused with the Timer, and updated the storage handler.