Fixed some typos and finalized