went through the jj file one time, going through it again to address issues
more changes, fixing things now that I have a better grip of javacc