Now tracking scrolls
Some general refactoring