Various typo and bug fixes
Merged