more work on scrolling bugs