Fixed typos, moved things around