slight rule modifcation, more to come. Lots of parser work zzzzzzzz