Updates CLI help and adds to todo