Various small fixes and more work on expanding the scrolling capabilities