Clean up some of the config override code (#2577)
Clean up some of the config override code (#2577)

* Clean up some of the config override code

* Clean up error messages a bit
thought-machine/please,thought-machine/please,thought-machine/please,thought-machine/please,thought-machine/please,thought-machine/please