Update UserSettings

javadoc + minor bug fixes