Increased scrolling speed and cleaned up some unused options