diff --git a/samples/LICENSE b/samples/LICENSE
index cd2262e..7bbf892 100644
--- a/samples/LICENSE
+++ b/samples/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 GraphQL Contributors
+Copyright (c) GraphQL Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/samples/kitchen-sink.graphql b/samples/kitchen-sink.graphql
index 874fdc1..f3146ee 100644
--- a/samples/kitchen-sink.graphql
+++ b/samples/kitchen-sink.graphql
@@ -1,14 +1,29 @@
 query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery {
   whoever123is: node(id: [123, 456]) {
-    id ,
+    id
     ... on User @onInlineFragment {
       field2 {
-        id ,
-        alias: field1(first:10, after:$foo,) @include(if: $foo) {
-          id,
+        id
+        alias: field1(first: 10, after: $foo) @include(if: $foo) {
+          id
           ...frag @onFragmentSpread
         }
       }
+      
+      field3!
+      field4?
+      requiredField5: field5!
+      requiredSelectionSet(first: 10)! @directive {
+        field
+      }
+
+      unsetListItemsRequiredList: listField[]!
+      requiredListItemsUnsetList: listField[!]
+      requiredListItemsRequiredList: listField[!]!
+      unsetListItemsOptionalList: listField[]?
+      optionalListItemsUnsetList: listField[?]
+      optionalListItemsOptionalList: listField[?]?
+      multidimensionalList: listField[[[!]!]!]!
     }
     ... @skip(unless: $foo) {
       id
@@ -28,8 +43,9 @@ mutation likeStory @onMutation {
 }
 
 subscription StoryLikeSubscription(
-  $input: StoryLikeSubscribeInput
-) @onSubscription {
+  $input: StoryLikeSubscribeInput @onVariableDefinition
+)
+  @onSubscription {
   storyLikeSubscribe(input: $input) {
     story {
       likers {
@@ -43,16 +59,23 @@ subscription StoryLikeSubscription(
 }
 
 fragment frag on Friend @onFragmentDefinition {
-  foo(size: $size, bar: $b, obj: {key: "value", block: """
-
+  foo(
+    size: $size
+    bar: $b
+    obj: {
+      key: "value"
+      block: """
       block string uses \"""
-
-  """})
+      """
+    }
+  )
 }
 
 {
-  unnamed(truthy: true, falsy: false, nullish: null),
+  unnamed(truthy: true, falsy: false, nullish: null)
   query
 }
 
-query { __typename }
+query {
+  __typename
+}
diff --git a/samples/schema-kitchen-sink.graphql b/samples/schema-kitchen-sink.graphql
index a670f6b..153881c 100644
--- a/samples/schema-kitchen-sink.graphql
+++ b/samples/schema-kitchen-sink.graphql
@@ -5,21 +5,21 @@ schema {
 
 """
 This is a description
-of the `Foo` type.
+of the \`Foo\` type.
 """
 type Foo implements Bar & Baz & Two {
-  "Description of the `one` field."
+  "Description of the \`one\` field."
   one: Type
   """
-  This is a description of the `two` field.
+  This is a description of the \`two\` field.
   """
   two(
     """
-    This is a description of the `argument` argument.
+    This is a description of the \`argument\` argument.
     """
     argument: InputType!
   ): Type
-  """This is a description of the `three` field."""
+  """This is a description of the \`three\` field."""
   three(argument: InputType, other: String): Int
   four(argument: String = "string"): String
   five(argument: [String] = ["string", "string"]): String
@@ -85,14 +85,14 @@ extend scalar CustomScalar @onScalar
 
 enum Site {
   """
-  This is a description of the `DESKTOP` value
+  This is a description of the \`DESKTOP\` value
   """
   DESKTOP
 
-  """This is a description of the `MOBILE` value"""
+  """This is a description of the \`MOBILE\` value"""
   MOBILE
 
-  "This is a description of the `WEB` value"
+  "This is a description of the \`WEB\` value"
   WEB
 }
 
@@ -127,9 +127,10 @@ extend input InputType {
 extend input InputType @onInputObject
 
 """
-This is a description of the `@skip` directive
+This is a description of the \`@skip\` directive
 """
 directive @skip(
+  """This is a description of the \`if\` argument"""
   if: Boolean! @onArgumentDefinition
 ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT