code cleanup, fixed some scrolling glitches
partially addresses #35