Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r3760b6241dca4d9439e23cecb69c79fc019e6250 -r6a644d66b282d1c0cb1625cf2322f1e67148556d
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 3760b6241dca4d9439e23cecb69c79fc019e6250)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 6a644d66b282d1c0cb1625cf2322f1e67148556d)
@@ -106,11 +106,6 @@
     <Compile Include="Data\PointBasedMapData.cs" />
     <Compile Include="IMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Version\Core.Common.Version.csproj">
@@ -125,13 +120,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Fisheye: Tag 6a644d66b282d1c0cb1625cf2322f1e67148556d refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6a644d66b282d1c0cb1625cf2322f1e67148556d refers to a dead (removed) revision in file `Core/Components/src/Core.Components.DotSpatial/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj
===================================================================
diff -u -rb76fb918ff93d5c8ce1a2ba2a23b37d09d2fa13f -r6a644d66b282d1c0cb1625cf2322f1e67148556d
--- Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj	(.../Core.Plugins.DotSpatial.csproj)	(revision b76fb918ff93d5c8ce1a2ba2a23b37d09d2fa13f)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj	(.../Core.Plugins.DotSpatial.csproj)	(revision 6a644d66b282d1c0cb1625cf2322f1e67148556d)
@@ -36,21 +36,12 @@
       <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6a644d66b282d1c0cb1625cf2322f1e67148556d
--- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs	(.../MapLegendController.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs	(.../MapLegendController.cs)	(revision 6a644d66b282d1c0cb1625cf2322f1e67148556d)
@@ -22,7 +22,6 @@
 using System;
 using Core.Common.Controls.Views;
 using Core.Common.Gui;
-using Core.Components.DotSpatial;
 using Core.Components.DotSpatial.Data;
 
 namespace Core.Plugins.DotSpatial.Legend
@@ -38,14 +37,14 @@
         public EventHandler<EventArgs> OnOpenLegend;
 
         /// <summary>
-        /// Creates a new instance of <see cref="MapLegendController"/>
+        /// Creates a new instance of <see cref="MapLegendController"/>.
         /// </summary>
-        /// <param name="toolViewController">The <see cref="DotSpatialGuiPlugin"/> to invoke actions upon.</param>
+        /// <param name="toolViewController">The <see cref="IToolViewController"/> to invoke actions upon.</param>
         public MapLegendController(IToolViewController toolViewController)
         {
             if (toolViewController == null)
             {
-                throw new ArgumentNullException("toolViewController", "Cannot create a MapLegendController when the plugin is null.");
+                throw new ArgumentNullException("toolViewController", "Cannot create a MapLegendController when the tool view controller is null.");
             }
             this.toolViewController = toolViewController;
         }
@@ -100,7 +99,7 @@
         /// <summary>
         /// Updates the data for the <see cref="MapLegendView"/> if it is open.
         /// </summary>
-        /// <param name="data">The <see cref="BaseMap"/> for which to show data. If <c>null</c> the 
+        /// <param name="data">The <see cref="MapData"/> to show. If <c>null</c> the 
         /// data will be cleared.</param>
         public void Update(MapData data)
         {
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6a644d66b282d1c0cb1625cf2322f1e67148556d
--- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 6a644d66b282d1c0cb1625cf2322f1e67148556d)
@@ -37,7 +37,7 @@
     /// </summary>
     public sealed partial class MapLegendView : UserControl, IView
     {
-        private TreeViewControl treeViewControl;
+        private readonly TreeViewControl treeViewControl;
 
         /// <summary>
         /// Creates a new instance of <see cref="MapLegendView"/>.
@@ -53,10 +53,10 @@
             };
             Controls.Add(treeViewControl);
 
-            RegisterTreeNodes();
+            RegisterTreeNodeInfos();
         }
 
-        private void RegisterTreeNodes()
+        private void RegisterTreeNodeInfos()
         {
             treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<MapPointData>
             {
@@ -66,21 +66,21 @@
             
             treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<MapLineData>
             {
-                Text = mapPointData => DotSpatialResources.MapDataNodePresenter_Line_data_label,
-                Image = mapPointData => DotSpatialResources.LineIcon
+                Text = mapLineData => DotSpatialResources.MapDataNodePresenter_Line_data_label,
+                Image = mapLineData => DotSpatialResources.LineIcon
             });
             
             treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<MapPolygonData>
             {
-                Text = mapPointData => DotSpatialResources.MapDataNodePresenter_Polygon_data_label,
-                Image = mapPointData => DotSpatialResources.AreaIcon
+                Text = mapPolygonData => DotSpatialResources.MapDataNodePresenter_Polygon_data_label,
+                Image = mapPolygonData => DotSpatialResources.AreaIcon
             });
 
             treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo<MapDataCollection>
             {
-                Text = mapPointData => DotSpatialResources.General_Map,
-                Image = mapPointData => GuiResources.folder,
-                ChildNodeObjects = baseMap => baseMap.List.Reverse().Cast<object>().ToArray()
+                Text = mapDataCollection => DotSpatialResources.General_Map,
+                Image = mapDataCollection => GuiResources.folder,
+                ChildNodeObjects = mapDataCollection => mapDataCollection.List.Reverse().Cast<object>().ToArray()
             });
         }
 
Index: Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6a644d66b282d1c0cb1625cf2322f1e67148556d
--- Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml.cs	(.../MapRibbon.xaml.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml.cs	(.../MapRibbon.xaml.cs)	(revision 6a644d66b282d1c0cb1625cf2322f1e67148556d)
@@ -29,17 +29,23 @@
 namespace Core.Plugins.DotSpatial
 {
     /// <summary>
-    /// Interaction logic for MapRibbon.xaml
+    /// This class represents the ribbon interaction which has to do with maps.
     /// </summary>
     public partial class MapRibbon : IRibbonCommandHandler
     {
         private IMap map;
 
+        /// <summary>
+        /// Creates a new instance of <see cref="MapRibbon"/>.
+        /// </summary>
         public MapRibbon()
         {
             InitializeComponent();
         }
 
+        /// <summary>
+        /// Sets the <see cref="IMap"/> to show the ribbon for.
+        /// </summary>
         public IMap Map
         {
             private get
@@ -61,6 +67,9 @@
             }
         }
 
+        /// <summary>
+        /// Sets the command used when the toggle legend view button is clicked.
+        /// </summary>
         public ICommand ToggleLegendViewCommand { private get; set; }
 
         public IEnumerable<ICommand> Commands
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6a644d66b282d1c0cb1625cf2322f1e67148556d
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 6a644d66b282d1c0cb1625cf2322f1e67148556d)
@@ -43,6 +43,9 @@
             InitializeComponent();
         }
 
+        /// <summary>
+        /// Sets the <see cref="IChart"/> to show the ribbon for.
+        /// </summary>
         public IChart Chart
         {
             private get
@@ -80,7 +83,6 @@
             }
         }
 
-
         /// <summary>
         /// Shows the charting contextual tab.
         /// </summary>
@@ -117,7 +119,7 @@
             // but more ideally be removed.
             return ChartingContextualGroup.Name == tabGroupName && ChartingContextualGroup.Visibility == Visibility.Visible;
         }
-        
+
         private void ButtonToggleLegend_Click(object sender, RoutedEventArgs e)
         {
             ToggleLegendViewCommand.Execute();
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendController.cs
===================================================================
diff -u -re4ee8a21ab07f3446dc417e50574b6bc6106f460 -r6a644d66b282d1c0cb1625cf2322f1e67148556d
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendController.cs	(.../LegendController.cs)	(revision e4ee8a21ab07f3446dc417e50574b6bc6106f460)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendController.cs	(.../LegendController.cs)	(revision 6a644d66b282d1c0cb1625cf2322f1e67148556d)
@@ -43,12 +43,12 @@
         /// <summary>
         /// Creates a new instance of <see cref="LegendController"/>.
         /// </summary>
-        /// <param name="toolViewController">The <see cref="OxyPlotGuiPlugin"/> to invoke actions upon.</param>
+        /// <param name="toolViewController">The <see cref="IToolViewController"/> to invoke actions upon.</param>
         public LegendController(IToolViewController toolViewController)
         {
             if (toolViewController == null)
             {
-                throw new ArgumentNullException("toolViewController", "Cannot create a LegendController when the plugin is null.");
+                throw new ArgumentNullException("toolViewController", "Cannot create a LegendController when the tool view controller is null.");
             }
             this.toolViewController = toolViewController;
         }
@@ -103,7 +103,7 @@
         /// <summary>
         /// Updates the data for the <see cref="LegendView"/> if it is open.
         /// </summary>
-        /// <param name="data">The <see cref="BaseChart"/> for which to show data. If <c>null</c> the 
+        /// <param name="data">The <see cref="ChartData"/> to show. If <c>null</c> the 
         /// data will be cleared.</param>
         public void Update(ChartData data)
         {