Some fixes on the parser and started the converter