diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
index 88249f5..cc5e092 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
@@ -53,13 +53,14 @@ protected function addContextAssignmentElement(ContextAwarePluginInterface $plug
         ];
         $element['context_slot_title'] = [
           '#type' => 'item',
-          '#title' => $this->t('@context value:', ['@context' => ucfirst($context_slot)]),
+          '#title' => $this->t('@context value:', ['@context' => $context_slot]),
           '#markup' => $options[$context_id],
         ];
       }
 
       if (count($options) > 1) {
-        // Remove the default value title because we have more than one value.
+        // The context display element is only useful when a single context is
+        // avaialable, we have multiple and require user interaction.
         unset($element['context_slot_title']);
 
         $assignments = $plugin->getContextMapping();
diff --git a/core/modules/aggregator/config/schema/aggregator.schema.yml b/core/modules/aggregator/config/schema/aggregator.schema.yml
index 80bcbb8..c835f15 100644
--- a/core/modules/aggregator/config/schema/aggregator.schema.yml
+++ b/core/modules/aggregator/config/schema/aggregator.schema.yml
@@ -48,6 +48,7 @@ block.settings.aggregator_feed_block:
       type: mapping
       label: 'Context assignments'
       mapping:
+        #This will be stored in the format of aggregator.feed:$uuid
         feed:
           type: string
           label: 'Feed'
diff --git a/core/modules/block/src/EventSubscriber/NodeRouteContext.php b/core/modules/block/src/EventSubscriber/NodeRouteContext.php
index 97cb0bb..cbb7fc7 100644
--- a/core/modules/block/src/EventSubscriber/NodeRouteContext.php
+++ b/core/modules/block/src/EventSubscriber/NodeRouteContext.php
@@ -61,7 +61,7 @@ public function onBlockActiveContext(BlockContextEvent $event) {
    * {@inheritdoc}
    */
   public function onBlockAdministrativeContext(BlockContextEvent $event) {
-    $context = new Context(new ContextDefinition('entity:node', $this->t('Node from route')));
+    $context = new Context(new ContextDefinition('entity:node', $this->t('Node from url')));
     $event->setContext('node.node', $context);
   }