updated, and fixed typos