backend: try to fix spec again
diagrams: cosmetic updates to cpp model