Add SCROLL_TO_CONTENT option, other minor tweaks