Improve CLI and errors