swap updates and fixes order to be consistent with previous notes
swap updates and fixes order to be consistent with previous notes

also fixed some typos

linus-sherrill/maptk,linus-sherrill/maptk,linus-sherrill/maptk,linus-sherrill/maptk,linus-sherrill/maptk