some scrolling updates
Merge branch 'scrolling-poll2' into teddy