Fixed a few hat block bugs
Updated parser.peg