Standard config update pass

Wow, look at all these gaps! Tut, tut.