Improve CLI and update README