diff --git a/type-graph.txt b/type-graph.txt
index 8c33a3998..a2a1d3910 100644
--- a/type-graph.txt
+++ b/type-graph.txt
@@ -88,8 +88,8 @@ class Label
 [Domain-specific]
 # Regex and Grammars
 class Match                         is Capture is Cool
-class Cursor
-class Grammar                       is Cursor
+class Cursor                        aka Match is Capture is Cool
+class Grammar                       is Match
 class Regex                         is Method
 
 [Basic]
@@ -114,10 +114,10 @@ class FatRat                        is Cool        does Rational[Int, Int]
 
 [Basic]
 # Allomorphs
-class IntStr                        is Str is Int
-class NumStr                        is Str is Num
-class RatStr                        is Str is Rat
-class ComplexStr                    is Str is Complex
+class IntStr                        is Int is Str
+class NumStr                        is Num is Str
+class RatStr                        is Rat is Str
+class ComplexStr                    is Complex is Str
 
 [Basic]
 # Temporal
@@ -229,7 +229,7 @@ role  Enumeration
 role  NumericEnumeration
 role  StringyEnumeration
 class Pair                                         does Associative
-class Map                           is Iterable is Cool does Associative
+class Map                           does Iterable is Cool does Associative
 class Stash                         is Hash
 class PseudoStash                   is Map
 class Hash                          is Map
@@ -250,7 +250,7 @@ class MixHash                       does Mixy
 # Exceptions: Base
 class Failure
 class Exception
-class Backtrace                     is List
+class Backtrace
 class Backtrace::Frame
 class Deprecation
 
@@ -280,7 +280,8 @@ class X::Proc::Unsuccessful         is Exception
 
 [Exceptions]
 # Exceptions: Numbers
-class X::Numeric::Real              is Exception
+class X::Numeric::CannotConvert     is Exception
+class X::Numeric::Real              is X::Numeric::CannotConvert
 
 [Exceptions]
 # Exceptions: Strings
@@ -372,8 +373,11 @@ class X::Bind::Slice                is Exception
 class X::Bind::ZenSlice             is X::Bind::Slice
 class X::Comp::AdHoc                is X::AdHoc    does X::Comp
 class X::Comp::NYI                  is X::NYI      does X::Comp
+class X::Trait::NotOnNative         is Exception
 class X::Comp::Trait::NotOnNative   is X::Trait::NotOnNative does X::Comp
+class X::Trait::Scope               is Exception
 class X::Comp::Trait::Scope         is X::Trait::Scope does X::Comp
+class X::Trait::Unknown             is Exception
 class X::Comp::Trait::Unknown       is X::Trait::Unknown does X::Comp
 class X::Declaration::Scope                        does X::Comp
 class X::Declaration::Scope::Multi  is X::Declaration::Scope