Parsing script improved
General clean-up + testbed