further fixes for scrolling