Fix CLI tutorial grammar and misc