Some config tweaks and some display changes.