Added a couple of utilities and changed some configuration.