clean up some comments and fix a timer