fixed some cli, get ready for dir walking