3 files changed, 26 insertions, 22 deletions
diff --git a/src/DotNetOAuth/ClassDiagram.cd b/src/DotNetOAuth/ClassDiagram.cd
index 5c33298..b32f08e 100644
--- a/src/DotNetOAuth/ClassDiagram.cd
+++ b/src/DotNetOAuth/ClassDiagram.cd
@@ -29,9 +29,9 @@
     <Position X="6.5" Y="4.5" Width="4.75" />
     <InheritanceLine Type="DotNetOAuth.ConsumerBase" FixedToPoint="true">
       <Path>
-        <Point X="8.875" Y="3.786" />
-        <Point X="8.875" Y="4.2" />
-        <Point X="8.125" Y="4.2" />
+        <Point X="11.375" Y="3.786" />
+        <Point X="11.375" Y="4.125" />
+        <Point X="8.125" Y="4.125" />
         <Point X="8.125" Y="4.5" />
       </Path>
     </InheritanceLine>
@@ -41,7 +41,7 @@
     </TypeIdentifier>
   </Class>
   <Class Name="DotNetOAuth.ConsumerBase">
-    <Position X="6.5" Y="0.5" Width="4.75" />
+    <Position X="9" Y="0.5" Width="4.75" />
     <TypeIdentifier>
       <HashCode>ACAAAAAgAAABEAAAAAAABgAAAAAIAAAAAQAAAAAAABA=</HashCode>
       <FileName>ConsumerBase.cs</FileName>
diff --git a/src/DotNetOAuth/DesktopConsumer.cs b/src/DotNetOAuth/DesktopConsumer.cs
index 0d86770..fe293f4 100644
--- a/src/DotNetOAuth/DesktopConsumer.cs
+++ b/src/DotNetOAuth/DesktopConsumer.cs
@@ -16,7 +16,7 @@ namespace DotNetOAuth {
 	/// </summary>
 	/// <remarks>
 	/// The methods on this class are thread-safe.  Provided the properties are set and not changed
-	/// afterward, a single instance of this class may be used by an entire web application safely.
+	/// afterward, a single instance of this class may be used by an entire desktop application safely.
 	/// </remarks>
 	public class DesktopConsumer : ConsumerBase {
 		/// <summary>
diff --git a/src/DotNetOAuth/Messages/OAuth Messages.cd b/src/DotNetOAuth/Messages/OAuth Messages.cd
index 4a555bb..3be52b7 100644
--- a/src/DotNetOAuth/Messages/OAuth Messages.cd
+++ b/src/DotNetOAuth/Messages/OAuth Messages.cd
@@ -7,12 +7,14 @@
     <Position X="4.36" Y="0.683" Height="0.291" Width="2.02" />
   </Comment>
   <Class Name="DotNetOAuth.Messages.AccessProtectedResourceMessage">
-    <Position X="3.75" Y="8.25" Width="3.5" />
-    <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <Position X="3.75" Y="8.5" Width="3.5" />
+    <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedToPoint="true">
       <Path>
-        <Point X="3.562" Y="5.367" />
-        <Point X="3.562" Y="8.375" />
-        <Point X="3.75" Y="8.375" />
+        <Point X="2.25" Y="6.588" />
+        <Point X="2.25" Y="6.828" />
+        <Point X="3.51" Y="6.828" />
+        <Point X="3.51" Y="9.312" />
+        <Point X="3.75" Y="9.312" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
@@ -33,7 +35,7 @@
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOAuth.Messages.DirectUserToConsumerMessage">
-    <Position X="7.5" Y="5.25" Width="3" />
+    <Position X="7.5" Y="5" Width="3" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
@@ -50,8 +52,8 @@
     </Compartments>
     <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedToPoint="true">
       <Path>
-        <Point X="10.75" Y="4.875" />
-        <Point X="7.25" Y="4.875" />
+        <Point X="10.75" Y="4.625" />
+        <Point X="7.25" Y="4.625" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
@@ -61,14 +63,16 @@
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOAuth.Messages.GrantAccessTokenMessage">
-    <Position X="7.5" Y="7.5" Width="3" />
+    <Position X="7.5" Y="7.25" Width="3" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
-    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedToPoint="true">
       <Path>
-        <Point X="11" Y="5.958" />
-        <Point X="11" Y="8.25" />
+        <Point X="12.5" Y="7.112" />
+        <Point X="12.5" Y="7.487" />
+        <Point X="10.875" Y="7.487" />
+        <Point X="10.875" Y="8.25" />
         <Point X="10.5" Y="8.25" />
       </Path>
     </InheritanceLine>
@@ -84,7 +88,7 @@
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>AAAKAAAAYAAAAAAEAIAAAAAAAAQEIDAAIgCAACAAAAA=</HashCode>
+      <HashCode>AAAKAAAAYAAAgAEEAIAAAAYAAAQEIDAAIgCCACAAAAA=</HashCode>
       <FileName>Messages\MessageBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -137,20 +141,20 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>IAAAFAAAAIAAAAAAgACAAgAAAgAAAAAAAAEAIAAQAAA=</HashCode>
+      <HashCode>IIAAFAAAAIAAAAAAgICAAgAAAgAAIAQAAAEAIAAQAAE=</HashCode>
       <FileName>Messages\SignedMessageBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Interface Name="DotNetOAuth.ChannelElements.ITamperResistantOAuthMessage">
-    <Position X="11.25" Y="6.25" Width="2.5" />
+    <Position X="11.25" Y="7.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AIAAAAAAAAAAAAAAAIAAAgAAAAAAIAQAAAAAAAAAAAA=</HashCode>
       <FileName>ChannelElements\ITamperResistantOAuthMessage.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="DotNetOAuth.Messages.ITokenSecretContainingMessage">
-    <Position X="1" Y="7" Width="2" />
+    <Position X="1" Y="8.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAA=</HashCode>
       <FileName>Messages\ITokenSecretContainingMessage.cs</FileName>
@@ -158,7 +162,7 @@
     </TypeIdentifier>
   </Interface>
   <Interface Name="DotNetOAuth.Messages.ITokenContainingMessage">
-    <Position X="1" Y="5.5" Width="2" />
+    <Position X="1" Y="7" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>
       <FileName>Messages\ITokenContainingMessage.cs</FileName>