scrolling and drawing now correct