Merge branch '2022-01-13-assorted-spelling-fixes'