Code cleanup, scroll fix, version bump to 1.4.1