scrollwheel fix and misc cleanup