Updated and fixed some typos