cleanup, remove need for scrolling jumps