diff --git a/packages/valkyrie-esoteric/source/effect/effect.valkyrie b/packages/valkyrie-esoteric/source/effect/effect.valkyrie
index 647168b..3578f0f 100644
--- a/packages/valkyrie-esoteric/source/effect/effect.valkyrie
+++ b/packages/valkyrie-esoteric/source/effect/effect.valkyrie
@@ -38,8 +38,6 @@ let n: usize = raise Double(1);
 # n = 2
 
 
-
-
 class Counter {
     count: usize = 99
 }
diff --git a/packages/valkyrie-esoteric/source/expression/class.vk b/packages/valkyrie-esoteric/source/expression/class.vk
index 5d61d86..2626a9d 100644
--- a/packages/valkyrie-esoteric/source/expression/class.vk
+++ b/packages/valkyrie-esoteric/source/expression/class.vk
@@ -21,27 +21,30 @@ class A4⟨T⟩ {
 
 ⍝ https:⍝crates.io/crates/custom_debug_derive
 class A3⟨T⟩ {
-    ↯debug(rename="new_name")
+    ↯show.debug(rename="new_name")
     name: u32
-    ↯debug(skip)
+    ↯show.debug(skip)
     skip: u32
 }
 
 
-↯Serialize
-↯Deserialize
-class B: Serialize + Deserialize {
+↯[Serialize, Deserialize]
+↯derive(Serialize, Deserialize)
+class B: !Serialize + !Deserialize {
     a: Integer,
     b: Integer,
 }
 
 class C {
-    x,
+    get set x,
+    ↯[get, set]
     y,
+    ↯get({ self.x })
+    ↯set
     z,
 }
 
-let val = @type_of(a);
+let val = @typus(a);
 let bbb = f(x).m(y)
 
 
diff --git a/packages/valkyrie-esoteric/source/statement/if-statement.valkyrie b/packages/valkyrie-esoteric/source/statement/if-statement.valkyrie
index b8c53b0..6b52df1 100644
--- a/packages/valkyrie-esoteric/source/statement/if-statement.valkyrie
+++ b/packages/valkyrie-esoteric/source/statement/if-statement.valkyrie
@@ -11,14 +11,13 @@ if [] {}
 if [1:2] {}
 if [1:2:3] {}
 
-if constant {}
-if function() {}
-if @macro {}
+if `constant` {}
+if `function`() {}
+if @micro {}
 if @macro() {}
 if x.field {}
 if x.method() {}
 
-
 scope {
     if expression is not Integer {}
     if expression is not Some(Integer) {}
diff --git a/packages/valkyrie-esoteric/source/statement/is-statement.valkyrie b/packages/valkyrie-esoteric/source/statement/is-statement.valkyrie
index 8ba478e..2d1a17b 100644
--- a/packages/valkyrie-esoteric/source/statement/is-statement.valkyrie
+++ b/packages/valkyrie-esoteric/source/statement/is-statement.valkyrie
@@ -54,6 +54,6 @@ if (a is {mutable: bool}) {
 if (a is Object {mutable: bool}) {
 
 }
-if (a is unity⸬Variant {mutable: bool}) {
+if (a is Unity⸬Variant {mutable: bool}) {
 
 }
diff --git a/packages/valkyrie-esoteric/source/statement/match-case.valkyrie b/packages/valkyrie-esoteric/source/statement/match-case.valkyrie
index c422ec9..fd9b1e9 100644
--- a/packages/valkyrie-esoteric/source/statement/match-case.valkyrie
+++ b/packages/valkyrie-esoteric/source/statement/match-case.valkyrie
@@ -31,7 +31,7 @@ match tuple {
     case (mut a, ref b) if a > 0 && b > 0:
     case Tuple(a, b):
     case Tuple((a, b), c):
-    case Tuple(Some(a), ⁜unity⸬Variant):
+    case Tuple(Some(a), ⁜Unity⸬Variant):
 }
 
 match array {
@@ -39,7 +39,7 @@ match array {
     case [a, ]:
     case [mut a, b]:
     case [none]:
-    case [unity⸬Variant]:
+    case [Unity⸬Variant]:
     case [[a], b]:
     case [[a], [b]]:
     case [[a, b], c]:
diff --git a/packages/valkyrie-esoteric/source/statement/match-type.valkyrie b/packages/valkyrie-esoteric/source/statement/match-type.valkyrie
index b2aff1d..5dbd038 100644
--- a/packages/valkyrie-esoteric/source/statement/match-type.valkyrie
+++ b/packages/valkyrie-esoteric/source/statement/match-type.valkyrie
@@ -23,14 +23,14 @@ match tuple {
     type (Type, ):
     type Tuple(Type, Type):
     type Tuple((Type, Type), Type):
-    type Tuple(Some(Type), ⁜unity⸬Variant):
+    type Tuple(Some(Type), ⁜Unity⸬Variant):
 }
 
 match array {
     type []:
     type [Type]:
     type [Type, ]:
-    type [unity⸬Variant]:
+    type [Unity⸬Variant]:
     type [[Type], Type]:
     type [[Type], [Type]]:
     type [[Type, Type], Type]:
diff --git a/packages/valkyrie-esoteric/source/statement/match-when.valkyrie b/packages/valkyrie-esoteric/source/statement/match-when.valkyrie
index cd6bfa7..562124a 100644
--- a/packages/valkyrie-esoteric/source/statement/match-when.valkyrie
+++ b/packages/valkyrie-esoteric/source/statement/match-when.valkyrie
@@ -16,14 +16,14 @@ match tuple {
     when (a, ):
     when Tuple(a, b):
     when Tuple((a, b), c):
-    when Tuple(Some(a), ⁜unity⸬Variant):
+    when Tuple(Some(a), ⁜Unity⸬Variant):
 }
 
 match array {
     when []:
     when [a, ]:
     when [none]:
-    when [unity⸬Variant]:
+    when [Unity⸬Variant]:
     when [[a], b]:
     when [[a], [b]]:
     when [[a, b], c]:
@@ -34,15 +34,9 @@ match x <- `object` {
     when x == call():
     when x == x.call():
     when x == new B {}:
-    ⍝ when {a: Type, }:
-    ⍝ when {a: Type, b: Type}:
-    ⍝ when Object {a: Type, b: Type}:
-    ⍝ when Object {a: {a: Type, b: Type}, c: Type}:
-    ⍝ when Object {a: Some(_), b: Type}:
 }
 scope {
     ();
     (a);
     (a, );
 }
-
diff --git a/packages/valkyrie-standard/test/tracing.vk b/packages/valkyrie-standard/test/tracing.vk
index 5b3bc0b..ae82de2 100644
--- a/packages/valkyrie-standard/test/tracing.vk
+++ b/packages/valkyrie-standard/test/tracing.vk
@@ -9,17 +9,17 @@ using package.trace.Tracing.{self, debug, print, alert, error};
 class Tracing {
     level: u8,
     message: String,
-    namespace: [String],
+    # `namespace`: [String],
     newline: bool,
 }
 
 extends Tracing {
 	print(newline: bool = true) {
-        raise new Tracing {
-            level: 30,
-            namespace: @caller.namepath,
-            newline,
-        }
+        # raise new Tracing {
+        #     level: 30,
+            # namespace: @caller.namepath,
+            # newline,
+        # }
     }
 }