revamped cli and doc