Added aux stub, improved cli