Update to last version of X3
Fixes
Clean type grammar
Cleanup