piki
piki
Spelling/formatting and minor edits

Corrected a bit of punctuation here, some spelling there, and edited the wording
or order of phrases in a few places to flow better (IMO).
Merge in changes from Zencephalon's upstream