fixed type, added CLI commands