Add missing stats, and sort fields alphabetically(?)