Added capabilities API

* also extended militant checking a little