Added more Conversion and fix some typo.