Merge pull request #558 from MHM5000/master

Alphabetizing and 3 fixes