Another big imporvements. Now I can just focus only on the grammar + automatas