Added a bit more content and cleaned up some more.