scrolling and other fixes