Lots of comments and bug fixes around scrolling