Removes debug statements, fixes the scrolling

The scrolling came from another branch, my bad - I should have checked
it in here initially.