Updates from 3/18 and 3/19 (user settings, bug fixes, etc.)
merge from hell