fix some scroll stuff
Merged parent branch