Moved things around and fixed typos