Settings updates

Doesn't build, working through the queue fragment.  Updated settings
stuff.