converter, some fixes
some fixes