Add a ConfigHandler and fix some indentation issues.