Some basic scrolling support
Some minor modifications