fix some typos and change to alphabetical ordering