Lots of setting tweaks, name change for new OS