another preparation patch for rework of settings.
Various changes, mostly minor and possibly uncontroversial.
