Gramatical fixes, reference updates, consistency updates