diff --git a/doc/Images/diagnose-capabilities-tree.png b/doc/Images/diagnose-capabilities-tree.png
new file mode 100644
index 0000000..6298cac
Binary files /dev/null and b/doc/Images/diagnose-capabilities-tree.png differ
diff --git a/doc/overview/about_project_capabilities.md b/doc/overview/about_project_capabilities.md
index 450cf4b..8dd8655 100644
--- a/doc/overview/about_project_capabilities.md
+++ b/doc/overview/about_project_capabilities.md
@@ -6,9 +6,11 @@ file extension does not help if you want to check for WPF vs. WinForms
 vs. Windows 8 XAML, for example. There are a great many different aspects
 to a project that may be present regardless of language. Do you want code
 that runs against any Windows 8 targeting project regardless of language?
-Do you want to target just Javascript Win8 projects but not LightSwitch
+Do you want to target just JavaScript Win8 projects but not LightSwitch
 JS projects? Project capability checks are the answer.
 
+## Checking capabilities
+
 The presence of some capability can be detected on a given project with
 code such as:
 
@@ -26,15 +28,54 @@ method in order to test for combinations of capabilities (including
 AND, OR, NOT logic). Read more about [the supported syntax and
 operators](https://msdn.microsoft.com/library/microsoft.visualstudio.shell.interop.ivsbooleansymbolexpressionevaluator.evaluateexpression.aspx).
 
-## How to declare project capabilities in your project
+## Filtering MEF parts via capabilities
+
+Classes exported via MEF can declare the project capabilities under which they apply. See [MEF](mef.md) for more information.
+
+## Defining capabilities via MSBuild
 
 Project capabilities can be declared in several ways, the easiest of which
-being to add this MSBuild item to your .targets file:
+being to add this MSBuild item to your `.targets` file:
 
 ```xml
-<ProjectCapability Include="MyOwnCapability" />
+<ItemGroup>
+  <ProjectCapability Include="MyOwnCapability" />
+</ItemGroup>
+```
+
+## Defining fixed capabilities for a project type
+
+Some capabilities are static/fixed for a given project type. These capabilities should be defined directly on the project type registration.
+
+For example:
+
+```csharp
+[assembly: ProjectTypeRegistration(
+    projectTypeGuid: MyProjectType.Guid,
+    displayName: "#1",
+    displayProjectFileExtensions: "#2",
+    defaultProjectExtension: "myproj",
+    language: "MyLang",
+    resourcePackageGuid: MyPackage.PackageGuid,
+    Capabilities = "MyProject; AnotherCapability")] // Define capabilities here
 ```
 
+Capabilities defined via the `ProjectTypeRegistrationAttribute.Capabilities` property are available on all projects loaded for that project type. Multiple values are separated by semicolon (`;`).
+
+Sometimes you'll need capabilities to be defined very early in a project's lifecycle. These fixed capabilities are available from
+
+## Viewing a project's capabilities
+
+To see the capabilities a CPS project defines, add the `DiagnoseCapabilities` project capability to turn on a tree in the VS Solution Explorer that lists all capabilities of the project:
+
+```xml
+<ItemGroup>
+  <ProjectCapability Include="DiagnoseCapabilities" />
+</ItemGroup>
+```
+
+![alt text](../Images/diagnose-capabilities-tree.png)
+
 ## Common project capabilities and where they are defined
 
 ### Existing project capabilities
@@ -82,7 +123,7 @@ It's very important that project capabilities you define fit this criteria:
   - Bad: `CS`
 - May include a version number, when necessary, but is usually discouraged.
 
-### Dynamic project capabilities
+## Dynamic project capabilities
 
 Capablities of a project can be changed without reloading the project.
 Read more about [dynamic project capabilities](dynamicCapabilities.md).
diff --git a/doc/overview/dynamicCapabilities.md b/doc/overview/dynamicCapabilities.md
index 4272eec..33f3dec 100644
--- a/doc/overview/dynamicCapabilities.md
+++ b/doc/overview/dynamicCapabilities.md
@@ -10,7 +10,6 @@ a project to be adjusted dynamically based on features/NuGet packages being used
 For example, WPF features can be turned on, only because the project references WPF related packages,
 instead of depending on which template was used when the project was created.
  
-
 ## Capabilities are now coming from dataflows
 
 In both unconfigured project and configured project scopes, capabilities are no longer a fixed set of strings.