Fixes and Typo Errors