Fix scrollTo issues and add some more ES6 sugar.