Further work
A couple of minor changes in configs and config values