More Typo fixes and some smaller optimizations