consolidated _complete, added clig cmd line params