Updated cli interface, some internals, and added docker module