removed id injection on blocks
removed id injection on blocks
removed name injection on constraints
cleaned up id & name injection stuff from PEG grammar
version bump .5