more grammar and miscellaneous changes