Auto scrolling bug fixes/cleanup