diff --git a/makefile.shade b/makefile.shade
index 562494d144..f087af75e1 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -5,3 +5,6 @@ var AUTHORS='Microsoft Open Technologies, Inc.'
 
 use-standard-lifecycle
 k-standard-goals
+
+#xml-docs-test target='test'
+  k-xml-docs-test
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperExecutionContext.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperExecutionContext.cs
index fafe33b303..046ff548bb 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperExecutionContext.cs
+++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperExecutionContext.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
         public string TagName { get; private set; }
 
         /// <summary>
-        /// The <see cref="ITagHelper">s' output.
+        /// The <see cref="ITagHelper"/>s' output.
         /// </summary>
         public TagHelperOutput Output { get; set; }
 
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs
index 82bc3d78cd..4cab64f12d 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs
+++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs
@@ -129,7 +129,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
         /// <summary>
         /// Generates the <see cref="TagHelperOutput"/>'s body.
         /// </summary>
-        /// <returns><c>string.Empty</c> if <see cref="SelfClosing"/> is <c>true</c>. <see cref="Output"/> otherwise.
+        /// <returns><c>string.Empty</c> if <see cref="SelfClosing"/> is <c>true</c>. <see cref="Content"/> otherwise.
         /// </returns>
         public string GenerateContent()
         {
diff --git a/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs b/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs
index d8c81561c7..5d7897389c 100644
--- a/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/CodeBuilderContext.cs
@@ -52,7 +52,8 @@ namespace Microsoft.AspNet.Razor.Generator
         public string TargetWriterName { get; set; }
 
         /// <summary>
-        /// Gets or sets the <c>SHA1</c> based checksum for the file whose location is defined by <see cref="SourceFile"/>.
+        /// Gets or sets the <c>SHA1</c> based checksum for the file whose location is defined by
+        /// <see cref="CodeGeneratorContext.SourceFile"/>.
         /// </summary>
         public string Checksum { get; set; }
     }
diff --git a/src/Microsoft.AspNet.Razor/Parser/RazorParser.cs b/src/Microsoft.AspNet.Razor/Parser/RazorParser.cs
index aa86c3832f..02d2046303 100644
--- a/src/Microsoft.AspNet.Razor/Parser/RazorParser.cs
+++ b/src/Microsoft.AspNet.Razor/Parser/RazorParser.cs
@@ -22,8 +22,8 @@ namespace Microsoft.AspNet.Razor.Parser
         /// Initializes a new instance of <see cref="RazorParser"/>.
         /// </summary>
         /// <param name="codeParser">The <see cref="ParserBase"/> used for parsing code content.</param>
-        /// <param name="markupParser">The <see cref="ParserBase"/> used for parsing markpup content.</param>
-        /// <param name="tagHelperDescriptorResolver">The <see cref=ITagHelperDescriptorResolver"/> used to resolve
+        /// <param name="markupParser">The <see cref="ParserBase"/> used for parsing markup content.</param>
+        /// <param name="tagHelperDescriptorResolver">The <see cref="ITagHelperDescriptorResolver"/> used to resolve
         /// <see cref="TagHelperDescriptor"/>s.</param>
         public RazorParser([NotNull] ParserBase codeParser,
                            [NotNull] ParserBase markupParser,
@@ -59,8 +59,7 @@ namespace Microsoft.AspNet.Razor.Parser
         public bool DesignTimeMode { get; set; }
 
         /// <summary>
-        /// Gets the <see cref=ITagHelperDescriptorResolver"/> used to resolve
-        /// <see cref="TagHelperDescriptor"/>s.</param>
+        /// Gets the <see cref="ITagHelperDescriptorResolver"/> used to resolve <see cref="TagHelperDescriptor"/>s.
         /// </summary>
         protected ITagHelperDescriptorResolver TagHelperDescriptorResolver { get; private set; }
 
diff --git a/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs b/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
index 24e615f498..40e10a0474 100644
--- a/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
+++ b/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
@@ -160,9 +160,9 @@ namespace Microsoft.AspNet.Razor
         /// </summary>
         /// <param name="inputStream">A <see cref="Stream"/> that represents the contents to be parsed.</param>
         /// <param name="className">The name of the generated class. When <c>null</c>, defaults to
-        /// <see cref="Host.DefaultClassName"/>.</param>
+        /// <see cref="RazorEngineHost.DefaultClassName"/> (<c>Host.DefaultClassName</c>).</param>
         /// <param name="rootNamespace">The namespace in which the generated class will reside. When <c>null</c>,
-        /// defaults to <see cref="Host.DefaultNamespace"/>.</param>
+        /// defaults to <see cref="RazorEngineHost.DefaultNamespace"/> (<c>Host.DefaultNamespace</c>).</param>
         /// <param name="sourceFileName">The file name to use in line pragmas, usually the original Razor file.</param>
         /// <returns>A <see cref="GeneratorResults"/> that represents the results of parsing the content.</returns>
         /// <remarks>