Reordered a few lists, cleans up duplicates, fixed spelling errors, added various entries to lists
added many new things, changing a bit of generation logic as well