Fix pyparsing parser
WIP: working on block management