grammar/syntax fixes