Minor grammar and syntax changes