[wip] EGSZ2a many fixes, not running through yet