Made a few tweaks to get the settings through reliably and tidy up the
docs and comments