Requested grammatical and context updates, adds to #442