Pulled in useful cosmetic changes from conf-hacks. Left out all the junk.