adjustments to grammar, still working out generics

added to Jurassic Core