Cleaned up diagrams and light edits