Different corrections

## Ready to merge

Different corrections and typo fixes