Fix Grammars/Add Graph