Moved some content around and fixed a few bugs