correction of bugs in the converters and small refactorings