- Add a *mode* key to the configuration file - Change some names around to be more consistent (not user-visible)