Merge back changes

I just corrected some minor mistakes regarding spelling, interpunction, lexemes and the like.