Parser fixed and strongly tested, bazinga.