Fixed some typos and final changes