Order lists alphabetically, some minor typos and labels