updated and cleaned up some diagrams
updated the top level static diagram
Merge branch 'origin/akm'