diff --git a/core/includes/update.inc b/core/includes/update.inc
index 459c2f5..a294490 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -683,9 +683,9 @@ function update_fix_d8_requirements() {
  *
  * This function is rarely necessary.
  *
- * @param $mdoule
+ * @param string $module
  *   Name of the module.
- * @param $schema_version
+ * @param string $schema_version
  *   The schema version the module should be set to.
  */
 function update_set_schema($module, $schema_version) {
diff --git a/core/lib/Drupal/Core/DependencyInjection/UpdateBundle.php b/core/lib/Drupal/Core/DependencyInjection/UpdateBundle.php
index 76b58ab..91528e5 100644
--- a/core/lib/Drupal/Core/DependencyInjection/UpdateBundle.php
+++ b/core/lib/Drupal/Core/DependencyInjection/UpdateBundle.php
@@ -35,10 +35,9 @@ public function build(SymfonyContainerBuilder $container) {
     $container->register('module_handler', 'Drupal\Core\Extension\UpdateModuleHandler')
       ->addArgument('%container.modules%');
     $container
-        ->register("cache_factory", 'Drupal\Core\Cache\MemoryBackendFactory');
+      ->register("cache_factory", 'Drupal\Core\Cache\MemoryBackendFactory');
     $container
-        ->register('router.builder', 'Drupal\Core\Routing\RouteBuilderStatic');
-
+      ->register('router.builder', 'Drupal\Core\Routing\RouteBuilderStatic');
   }
 
 }
diff --git a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
index a4cc866..55c7d8e 100644
--- a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php
@@ -10,6 +10,11 @@
 use Drupal\Core\Config\ConfigException;
 use Drupal\Core\Config\FileStorage;
 
+/**
+ * Deals with module enables and throws exception if hooks fired during updates.
+ *
+ * This is necessary for a reliable and testable update environment.
+ */
 class UpdateModuleHandler extends ModuleHandler {
 
   /**
@@ -110,7 +115,7 @@ public function enable($module_list, $enable_dependencies = TRUE) {
       $this->moduleList[$module] = drupal_get_filename('module', $module);
       $this->load($module);
       drupal_classloader_register($module, dirname($this->moduleList[$module]));
-      //  @todo: figure out what to do about hook_install() and hook_enable().
+      // @todo Figure out what to do about hook_install() and hook_enable().
     }
     return $old_schema;
   }
diff --git a/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php b/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php
index ec314ca..d6161f6 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Routing\RouteBuilder.
+ * Contains \Drupal\Core\Routing\RouteBuilderStatic.
  */
 
 namespace Drupal\Core\Routing;
@@ -11,8 +11,13 @@
  * This builds a static version of the router.
  */
 class RouteBuilderStatic {
+
+  /**
+   * Rebuilds router.
+   */
   public function rebuild() {
-    // @TODO: add the route for the batch pages when that conversion happens.
+    // @todo Add the route for the batch pages when that conversion happens,
+    //   http://drupal.org/node/1987816.
   }
 
 }
diff --git a/core/modules/language/language.install b/core/modules/language/language.install
index ff9b25a..17828fd 100644
--- a/core/modules/language/language.install
+++ b/core/modules/language/language.install
@@ -119,7 +119,7 @@ function language_disable() {
 }
 
 /**
- * Implemnets hook_requirements().
+ * Implements hook_requirements().
  */
 function language_requirements($phase) {
   if ($phase == 'update') {
diff --git a/core/update.php b/core/update.php
index 5d1bdc2..deb3f52 100644
--- a/core/update.php
+++ b/core/update.php
@@ -14,8 +14,8 @@
  * back to its original state!
  */
 
-use Symfony\Component\HttpFoundation\Request;
 use Drupal\Core\DrupalKernel;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -182,7 +182,7 @@ function update_helpful_links() {
 /**
  * Remove update overrides and flush all caches.
  *
- * This needs to be ran once all (if any) updates are ran. Do not call this
+ * This will need to be run once all (if any) updates are run. Do not call this
  * while updates are running.
  */
 function update_flush_all_caches() {