My changes to my settings, plus some style fixup.