Many fixes
Fixed typo