Fixed Bug, and Typo