Fixed many more errors / typos