fixes to scrolling