[IMP] improved some typo and code.