bug fixes

more bugfixes, 3 left....
Added epsilon non terminal