Updated scroller classes. Other minor updates