bug and typo fix