Decoupled again the converter from the parser and added various imprprovements and tests