bug fixes on scroll, in edit mode