diff --git a/page_manager.routing.yml b/page_manager.routing.yml
index f519dcf..b4af27a 100644
--- a/page_manager.routing.yml
+++ b/page_manager.routing.yml
@@ -23,7 +23,6 @@ entity.page.add_step_form:
     _entity_wizard: 'page.add'
     _title: 'Add new page'
     tempstore_id: page_manager.page
-    page: '{machine_name}'
   requirements:
     _entity_create_access: page
 
diff --git a/src/Form/AccessDelete.php b/src/Form/AccessDelete.php
index c4a5928..3dcdaf9 100644
--- a/src/Form/AccessDelete.php
+++ b/src/Form/AccessDelete.php
@@ -30,7 +30,7 @@ class AccessDelete extends ConditionDelete {
    * {@inheritdoc}
    */
   protected function getConditions($cached_values) {
-    /** @var $page \Drupal\page_manager\Entity\Page */
+    /** @var $page \Drupal\page_manager\PageInterface */
     $page = $cached_values['page'];
     return $page->get('access_conditions');
   }
@@ -39,7 +39,7 @@ class AccessDelete extends ConditionDelete {
    * {@inheritdoc}
    */
   protected function setConditions($cached_values, $conditions) {
-    /** @var $page \Drupal\page_manager\Entity\Page */
+    /** @var $page \Drupal\page_manager\PageInterface */
     $page = $cached_values['page'];
     $page->set('access_conditions', $conditions);
     return $cached_values;
@@ -49,7 +49,7 @@ class AccessDelete extends ConditionDelete {
    * {@inheritdoc}
    */
   protected function getContexts($cached_values) {
-    /** @var $page \Drupal\page_manager\Entity\Page */
+    /** @var $page \Drupal\page_manager\PageInterface */
     $page = $cached_values['page'];
     return $page->getContexts();
   }
diff --git a/src/Form/PageContextsForm.php b/src/Form/PageContextsForm.php
index 054eca8..48c1eb0 100644
--- a/src/Form/PageContextsForm.php
+++ b/src/Form/PageContextsForm.php
@@ -26,15 +26,15 @@ class PageContextsForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $cached_values = $form_state->getTemporaryValue('wizard');
-    $form['items'] = array(
+    $form['items'] = [
       '#type' => 'markup',
       '#prefix' => '<div id="available-contexts">',
       '#suffix' => '</div>',
       '#theme' => 'table',
-      '#header' => array($this->t('Context'), $this->t('Type'), $this->t('Operations')),
+      '#header' => [$this->t('Context'), $this->t('Type'), $this->t('Operations')],
       '#rows' => $this->renderRows($cached_values),
-      '#empty' => t('No Contexts configured for this variant.')
-    );
+      '#empty' => $this->t('No Contexts configured for this variant.')
+    ];
     $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
     return $form;
   }
@@ -66,7 +66,7 @@ class PageContextsForm extends FormBase {
             //drupal_set_message('List ' . $property . ': ' . var_export($value->getItemDefinition()->getDataType(), TRUE));
             //drupal_set_message(var_export($value->getItemDefinition(), TRUE));
             $definition = \Drupal::typedDataManager()->create($value->getItemDefinition());
-            drupal_set_message(var_export($definition, TRUE));
+            //drupal_set_message(var_export($definition, TRUE));
           }
           else {
             //drupal_set_message('Primative ' . $property . ': ' . var_export($value->getDataType(), TRUE));
diff --git a/src/Form/PageGeneralForm.php b/src/Form/PageGeneralForm.php
index d1855fe..2f4c427 100644
--- a/src/Form/PageGeneralForm.php
+++ b/src/Form/PageGeneralForm.php
@@ -30,7 +30,7 @@ class PageGeneralForm extends FormBase {
   protected $entityQuery;
 
   /**
-   * Constructs a new DisplayVariantAddForm.
+   * Constructs a new PageGeneralForm.
    *
    * @param \Drupal\Core\Display\VariantManager $variant_manager
    *   The variant manager.
@@ -103,6 +103,7 @@ class PageGeneralForm extends FormBase {
         '#options' => [
           'access' => $this->t('Access controls'),
           'selection' => $this->t('Selection rules'),
+          // @todo must complete the contexts section of the wizard.
           //'contexts' => $this->t('Contexts'),
         ],
         '#default_value' => !empty($cached_values['wizard_options']) ? $cached_values['wizard_options'] : [],
diff --git a/src/Form/PageVariantConfigureForm.php b/src/Form/PageVariantConfigureForm.php
index f5a41c9..7547f0b 100644
--- a/src/Form/PageVariantConfigureForm.php
+++ b/src/Form/PageVariantConfigureForm.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\page_manager\Form\PageVariant\ConfigureForm.
+ * Contains \Drupal\page_manager\Form\PageVariantConfigureForm.
  */
 
 namespace Drupal\page_manager\Form;
diff --git a/src/Form/SelectionConfigure.php b/src/Form/SelectionConfigure.php
index e7d5ac9..f9999d6 100644
--- a/src/Form/SelectionConfigure.php
+++ b/src/Form/SelectionConfigure.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\page_manager\Form\AccessConfigure;
+ * Contains \Drupal\page_manager\Form\SelectionConfigure.
  */
 
 namespace Drupal\page_manager\Form;
diff --git a/src/Form/SelectionDelete.php b/src/Form/SelectionDelete.php
index c1479d6..e1137c9 100644
--- a/src/Form/SelectionDelete.php
+++ b/src/Form/SelectionDelete.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\page_manager\Form\AccessDelete.
+ * Contains \Drupal\page_manager\Form\SelectionDelete.
  */
 
 namespace Drupal\page_manager\Form;
diff --git a/src/Form/VariantPluginConfigureBlockFormBase.php b/src/Form/VariantPluginConfigureBlockFormBase.php
index 9e322f4..48bdd73 100644
--- a/src/Form/VariantPluginConfigureBlockFormBase.php
+++ b/src/Form/VariantPluginConfigureBlockFormBase.php
@@ -45,7 +45,7 @@ abstract class VariantPluginConfigureBlockFormBase extends FormBase {
   protected $block;
 
   /**
-   * Constructs a new DisplayVariantAddForm.
+   * Constructs a new VariantPluginConfigureBlockFormBase.
    *
    * @param \Drupal\user\SharedTempStoreFactory $tempstore
    *   The tempstore factory.
diff --git a/src/Form/VariantPluginContentForm.php b/src/Form/VariantPluginContentForm.php
index 2fa7661..8e8b8c6 100644
--- a/src/Form/VariantPluginContentForm.php
+++ b/src/Form/VariantPluginContentForm.php
@@ -29,7 +29,7 @@ class VariantPluginContentForm extends FormBase {
   protected $tempstore;
 
   /**
-   * Constructs a new DisplayVariantAddForm.
+   * Constructs a new VariantPluginContentForm.
    *
    * @param \Drupal\user\SharedTempStoreFactory $tempstore
    *   The tempstore factory.
@@ -48,7 +48,7 @@ class VariantPluginContentForm extends FormBase {
   }
 
   /**
-   * Get the tempstore id.
+   * Get the tempstore ID.
    *
    * @return string
    */
diff --git a/src/Wizard/PageWizardBase.php b/src/Wizard/PageWizardBase.php
index b7d18e4..c66a1c2 100644
--- a/src/Wizard/PageWizardBase.php
+++ b/src/Wizard/PageWizardBase.php
@@ -57,10 +57,6 @@ class PageWizardBase extends EntityFormWizardBase {
       'title' => $this->t('Page Information'),
       'form' => '\Drupal\page_manager\Form\PageGeneralForm',
     ];
-
-    /** @var $page \Drupal\page_manager\Entity\Page */
-    $page = $cached_values['page'];
-
     $operations['access'] = [
       'title' => $this->t('Page Access'),
       'form' => '\Drupal\page_manager\Form\PageAccessForm',