Fixed many typos and merge errors