more fixes to scroll