a few enhancements to the conversion