more clean-up of scrolling algorithm
more scrolling improvements