Some cleaning up of stuff, the tools now follow the config to disable their abilities. A couple of reformatting, but everything else is the same