Scrolling working in both directions, other fixes