Fixed path
Added Cli, more checks