Fiddling, further cleanup
Twiddled the config to build in advanced mode.