Improved converter. Added a few unit types.