OMGWTF

Had so many problems trying to merge NonTerminals.java, i hope i didnt
break everything >_>

Also, i fixed some errors.