Some minor alterations and config options changed.