scrolling and general fixes