Various changes from...well...quite a while. This includes some CFG faffing stuff.