Some alphabetizing.
Fixes typos.
Some alphabetizing.
Merge pull request #582 from jwworth/master

Some alphabetizing and typos