Some more syntactical edits