Fix the little fixes and some typos