slight restructure and update the config settings