Refactor to use cli library; adding help for all cmds.