scroll fix
save on run
Revert "save on run"

This reverts commit 6b1aab899c7b7557937e3030063c6cf179e9012c.
Merge branch 'avielbt-fixes'