fixed scrolling. slight clean up