cli - lib.controlwq
some fixes