Improve formatting

And add GA, and also improve parsing of Edict2 (almost done)