fixed flicker
cleaned up some of the comments
updated some comments