Grammatical- and contextual fixes