Fixed typos, added new stuff