Updated more of the jj file, including several of the expressions and assignment to work correctly with the entities.