Updates diagrams (not final)
Adds a couple TODOs
Fixes broken spec