added simple cli and addtl changes