Again fixed some typos and refactored some passages and formatting