update from upstream
converter: minor fixes + comments
update upstream