Fixed up some content, added some better diagrams