config-master changes, tidy up