Touch ups, comments, and fixing problem with scroll listener not resetting