From 505c95c827ee2201ee5d74f1ac4d447509f3ba35 Mon Sep 17 00:00:00 2001
From: Sean Gilliam <sean.gilliam@gmail.com>
Date: Fri, 27 Jan 2017 16:20:26 -0600
Subject: [PATCH] [api-docs] Various fixes

This PR contains various fixes including filling in TBD placeholders,
fixed numerous copyright headers and converted a repetitive class to a
T4 template.
---
 .../PersistentShardCoordinator.Messages.cs    |   2 -
 .../Properties/AssemblyInfo.cs                |   9 +-
 .../Properties/AssemblyInfo.cs                |   9 +-
 .../Properties/AssemblyInfo.cs                |   9 +-
 .../Serialization/ReplicatedDataSerializer.cs |   9 +-
 .../ReplicatorMessageSerializer.cs            |   9 +-
 .../DeliveryBuffer.cs                         |   2 +-
 .../BatchingSqliteAllPersistenceIdSpec.cs     |   9 +-
 ...BatchingSqliteEventsByPersistenceIdSpec.cs |   9 +-
 .../Batching/BatchingSqliteEventsByTagSpec.cs |   9 +-
 .../Batching/BatchingSqliteJournalSpec.cs     |   9 +-
 .../Query/SqliteAllPersistenceIdsSpec.cs      |   2 +-
 .../Properties/AssemblyInfo.cs                |   9 +-
 .../Properties/AssemblyInfo.cs                |   9 +-
 .../CoreAPISpec.ApproveCore.approved.txt      |   2 +-
 .../MultiNodeClusterSpec.cs                   |   2 +-
 src/core/Akka.Persistence.Query/Interfaces.cs |   2 +-
 .../PersistentActorRecoveryTimeoutSpec.cs     |   2 +-
 .../Eventsourced.Lifecycle.cs                 |   2 -
 .../RemoteReDeploymentSpec.cs                 |   2 +-
 src/core/Akka.Remote/Endpoint.cs              |   1 +
 .../Akka.Remote/Transport/AkkaPduCodec.cs     |   3 -
 .../FusedGraphsBenchmark.cs                   |   9 +-
 .../JsonFramingBenchmark.cs                   |   9 +-
 .../AkkaSubscriberVerification.cs             |   2 +-
 .../VirtualPublisherTest.cs                   |   2 +-
 .../Dsl/FlowSelectAsyncUnorderedSpec.cs       |   2 +-
 src/core/Akka.Streams/Dsl/Hub.cs              |   9 +-
 .../Implementation/UntypedVirtualPublisher.cs |   2 +-
 src/core/Akka.Streams/Stage/AbstractStage.cs  |  11 +-
 src/core/Akka.TestKit/TestKitBase_ActorOf.cs  |   2 +-
 src/core/Akka.TestKit/TestProbe.cs            |   2 +-
 .../Scheduler/HashedWheelTimerScheduler.cs    |   4 +-
 src/core/Akka/Akka.csproj                     |  14 +-
 .../Hocon/AkkaConfigurationSection.cs         |   2 +
 .../Hocon/CDataConfigurationElement.cs        |   6 +-
 .../Configuration/Hocon/HoconTokenizer.cs     |  20 +--
 src/core/Akka/IO/ByteBuffer.cs                |   2 +-
 src/core/Akka/IO/Inet.cs                      |   2 -
 src/core/Akka/IO/Tcp.cs                       |   2 -
 src/core/Akka/Routing/Broadcast.cs            |  19 ++-
 src/core/Akka/Routing/ConsistentHash.cs       | 154 ++++++++----------
 src/core/Akka/Routing/ConsistentHashRouter.cs |  24 ++-
 src/core/Akka/Routing/Random.cs               |  12 +-
 src/core/Akka/Routing/RoundRobin.cs           |  16 +-
 src/core/Akka/Routing/RouterConfig.cs         |  14 +-
 .../Routing/ScatterGatherFirstCompleted.cs    |  22 +--
 src/core/Akka/Routing/SmallestMailbox.cs      |   6 +-
 src/core/Akka/Routing/TailChopping.cs         |  24 ++-
 src/core/Akka/Util/ByteString.cs              |   2 -
 .../PartialHandlerArgumentsCapture.cs         |  33 +---
 .../PartialHandlerArgumentsCapture.tt         | 102 ++++++++++++
 src/core/Akka/Util/MonotonicClock.cs          |   3 -
 53 files changed, 413 insertions(+), 241 deletions(-)
 create mode 100644 src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.tt

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.Messages.cs b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.Messages.cs
index a0f982e6be0..6c06119b52e 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.Messages.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShardCoordinator.Messages.cs
@@ -948,12 +948,10 @@ public class ShardHomeAllocated : IDomainEvent
             /// <summary>
             /// TBD
             /// </summary>
-            /// <param name="shard">TBD</param>
             public readonly ShardId Shard;
             /// <summary>
             /// TBD
             /// </summary>
-            /// <param name="shard">TBD</param>
             public readonly IActorRef Region;
 
             /// <summary>
diff --git a/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Properties/AssemblyInfo.cs
index 06bef7e4294..811d1a7b3ee 100644
--- a/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/src/contrib/cluster/Akka.DistributedData.Tests/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.DistributedData.Tests/Properties/AssemblyInfo.cs
index 0a77c1342b3..ab0b48d108e 100644
--- a/src/contrib/cluster/Akka.DistributedData.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.DistributedData.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/src/contrib/cluster/Akka.DistributedData/Properties/AssemblyInfo.cs b/src/contrib/cluster/Akka.DistributedData/Properties/AssemblyInfo.cs
index 2ceeab0482b..f32893d0d19 100644
--- a/src/contrib/cluster/Akka.DistributedData/Properties/AssemblyInfo.cs
+++ b/src/contrib/cluster/Akka.DistributedData/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatedDataSerializer.cs b/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatedDataSerializer.cs
index d247e865d95..8fadbcfbd32 100644
--- a/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatedDataSerializer.cs
+++ b/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatedDataSerializer.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+// <copyright file="ReplicatedDataSerializer.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
 using System.IO;
 using Akka.Actor;
 using Akka.Util;
diff --git a/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatorMessageSerializer.cs b/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatorMessageSerializer.cs
index 033f669cc67..74802718ca6 100644
--- a/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatorMessageSerializer.cs
+++ b/src/contrib/cluster/Akka.DistributedData/Serialization/ReplicatorMessageSerializer.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+// <copyright file="ReplicatorMessageSerializer.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
 using System.Collections.Generic;
 using System.IO;
 using Akka.Actor;
diff --git a/src/contrib/persistence/Akka.Persistence.Query.Sql/DeliveryBuffer.cs b/src/contrib/persistence/Akka.Persistence.Query.Sql/DeliveryBuffer.cs
index 764b088a174..e7ed28b6d9a 100644
--- a/src/contrib/persistence/Akka.Persistence.Query.Sql/DeliveryBuffer.cs
+++ b/src/contrib/persistence/Akka.Persistence.Query.Sql/DeliveryBuffer.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="AllPersistenceIdsPublisher.cs" company="Akka.NET Project">
+// <copyright file="DeliveryBuffer.cs" company="Akka.NET Project">
 //     Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteAllPersistenceIdSpec.cs b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteAllPersistenceIdSpec.cs
index 1b6980af780..6b53e9715ad 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteAllPersistenceIdSpec.cs
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteAllPersistenceIdSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Configuration;
+//-----------------------------------------------------------------------
+// <copyright file="BatchingSqliteAllPersistenceIdSpec.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
 using Akka.Persistence.Query.Sql;
 using Akka.Persistence.Sql.TestKit;
 using Akka.Util.Internal;
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByPersistenceIdSpec.cs b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByPersistenceIdSpec.cs
index b889d057b92..a8614fbb691 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByPersistenceIdSpec.cs
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByPersistenceIdSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Configuration;
+//-----------------------------------------------------------------------
+// <copyright file="BatchingSqliteEventsByPersistenceIdSpec.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
 using Akka.Persistence.Query.Sql;
 using Akka.Persistence.Sql.TestKit;
 using Akka.Util.Internal;
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByTagSpec.cs b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByTagSpec.cs
index 135696a6ea7..35dceeef32f 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByTagSpec.cs
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteEventsByTagSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Configuration;
+//-----------------------------------------------------------------------
+// <copyright file="BatchingSqliteEventsByTagSpec.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
 using Akka.Persistence.Query.Sql;
 using Akka.Persistence.Sql.TestKit;
 using Akka.Util.Internal;
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteJournalSpec.cs b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteJournalSpec.cs
index dd8d055089d..c7f1a37d2a1 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteJournalSpec.cs
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Batching/BatchingSqliteJournalSpec.cs
@@ -1,4 +1,11 @@
-using Akka.Configuration;
+//-----------------------------------------------------------------------
+// <copyright file="BatchingSqliteJournalSpec.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
 using Akka.Persistence.TestKit.Journal;
 using Akka.Util.Internal;
 using Xunit.Abstractions;
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Query/SqliteAllPersistenceIdsSpec.cs b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Query/SqliteAllPersistenceIdsSpec.cs
index b3c1da9a33f..2358661e887 100644
--- a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Query/SqliteAllPersistenceIdsSpec.cs
+++ b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Query/SqliteAllPersistenceIdsSpec.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="SqliteEventsByTagSpec.cs" company="Akka.NET Project">
+// <copyright file="SqliteAllPersistenceIdsSpec.cs" company="Akka.NET Project">
 //     Copyright (C) 2009-2016 Typesafe Inc. <http://www.typesafe.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Properties/AssemblyInfo.cs b/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Properties/AssemblyInfo.cs
index f9a414e38a9..6765942f8b5 100644
--- a/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Properties/AssemblyInfo.cs
+++ b/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/src/contrib/serializers/Akka.Serialization.Hyperion/Properties/AssemblyInfo.cs b/src/contrib/serializers/Akka.Serialization.Hyperion/Properties/AssemblyInfo.cs
index 688f1c524de..e2d124d61be 100644
--- a/src/contrib/serializers/Akka.Serialization.Hyperion/Properties/AssemblyInfo.cs
+++ b/src/contrib/serializers/Akka.Serialization.Hyperion/Properties/AssemblyInfo.cs
@@ -1,4 +1,11 @@
-using System.Reflection;
+//-----------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt
index 1c2364f83e4..707925068dc 100644
--- a/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt
+++ b/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt
@@ -4639,7 +4639,7 @@ namespace Akka.Tools.MatchHandler
     public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> : Akka.Tools.MatchHandler.IPartialHandlerArgumentsCapture<T>
     {
         public PartialHandlerArgumentsCapture() { }
-        public bool Handle(T message) { }
+        public bool Handle(T value) { }
         public void Initialize(System.Delegate handler, System.Collections.Generic.IReadOnlyList<object> arguments) { }
     }
     public sealed class PartialHandlerArgumentsCapture<T, T1> : Akka.Tools.MatchHandler.IPartialHandlerArgumentsCapture<T>
diff --git a/src/core/Akka.Cluster.TestKit/MultiNodeClusterSpec.cs b/src/core/Akka.Cluster.TestKit/MultiNodeClusterSpec.cs
index c823157c86c..2a16cc1b89d 100644
--- a/src/core/Akka.Cluster.TestKit/MultiNodeClusterSpec.cs
+++ b/src/core/Akka.Cluster.TestKit/MultiNodeClusterSpec.cs
@@ -249,7 +249,7 @@ public void StartClusterNode()
         }
 
         /// <summary>
-        /// Initialize the cluster of the specified member nodes (<see cref="roles"/>)
+        /// Initialize the cluster of the specified member nodes (<paramref name="roles"/>)
         /// and wait until all joined and <see cref="MemberStatus.Up"/>.
         /// 
         /// First node will be started first and others will join the first.
diff --git a/src/core/Akka.Persistence.Query/Interfaces.cs b/src/core/Akka.Persistence.Query/Interfaces.cs
index d51749ff167..10962cb8085 100644
--- a/src/core/Akka.Persistence.Query/Interfaces.cs
+++ b/src/core/Akka.Persistence.Query/Interfaces.cs
@@ -83,7 +83,7 @@ public interface IEventsByPersistenceIdQuery : IReadJournal
         /// Query events for a specific <see cref="PersistentActor"/> identified by <paramref name="persistenceId"/>.
         /// <para>
         /// You can retrieve a subset of all events by specifying <paramref name="fromSequenceNr"/> and <paramref name="toSequenceNr"/>
-        /// or use <see cref="0L"/> and <see cref="long.MaxValue"/> respectively to retrieve all events.
+        /// or use <c>0L</c> and <see cref="long.MaxValue"/> respectively to retrieve all events.
         /// </para>
         /// The returned event stream should be ordered by sequence number.
         /// <para>
diff --git a/src/core/Akka.Persistence.Tests/PersistentActorRecoveryTimeoutSpec.cs b/src/core/Akka.Persistence.Tests/PersistentActorRecoveryTimeoutSpec.cs
index 281be5fa120..926a2a967f7 100644
--- a/src/core/Akka.Persistence.Tests/PersistentActorRecoveryTimeoutSpec.cs
+++ b/src/core/Akka.Persistence.Tests/PersistentActorRecoveryTimeoutSpec.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="PersistentActorFailureSpec.cs" company="Akka.NET Project">
+// <copyright file="PersistentActorRecoveryTimeoutSpec.cs" company="Akka.NET Project">
 //     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/core/Akka.Persistence/Eventsourced.Lifecycle.cs b/src/core/Akka.Persistence/Eventsourced.Lifecycle.cs
index 486e7c73556..1650f67de71 100644
--- a/src/core/Akka.Persistence/Eventsourced.Lifecycle.cs
+++ b/src/core/Akka.Persistence/Eventsourced.Lifecycle.cs
@@ -18,8 +18,6 @@ public partial class Eventsourced
         /// <summary>
         /// TBD
         /// </summary>
-        /// <param name="envelope">TBD</param>
-        /// <returns>TBD</returns>
         public static readonly Func<Envelope, bool> UnstashFilterPredicate =
             envelope => !(envelope.Message is WriteMessageSuccess || envelope.Message is ReplayedMessage);
 
diff --git a/src/core/Akka.Remote.Tests.MultiNode/RemoteReDeploymentSpec.cs b/src/core/Akka.Remote.Tests.MultiNode/RemoteReDeploymentSpec.cs
index 3399669c608..abeb035a476 100644
--- a/src/core/Akka.Remote.Tests.MultiNode/RemoteReDeploymentSpec.cs
+++ b/src/core/Akka.Remote.Tests.MultiNode/RemoteReDeploymentSpec.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="RemoteRoundRobinSpec.cs" company="Akka.NET Project">
+// <copyright file="RemoteReDeploymentSpec.cs" company="Akka.NET Project">
 //     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/core/Akka.Remote/Endpoint.cs b/src/core/Akka.Remote/Endpoint.cs
index 457efd7d2a0..2dcc1737747 100644
--- a/src/core/Akka.Remote/Endpoint.cs
+++ b/src/core/Akka.Remote/Endpoint.cs
@@ -211,6 +211,7 @@ internal sealed class ShutDownAssociation : EndpointException, IAssociationProbl
         /// <summary>
         /// TBD
         /// </summary>
+        /// <param name="message">TBD</param>
         /// <param name="localAddress">TBD</param>
         /// <param name="remoteAddress">TBD</param>
         /// <param name="cause">TBD</param>
diff --git a/src/core/Akka.Remote/Transport/AkkaPduCodec.cs b/src/core/Akka.Remote/Transport/AkkaPduCodec.cs
index ceb90e68ab3..e74bfcc1c62 100644
--- a/src/core/Akka.Remote/Transport/AkkaPduCodec.cs
+++ b/src/core/Akka.Remote/Transport/AkkaPduCodec.cs
@@ -136,9 +136,6 @@ public Message(IInternalActorRef recipient, Address recipientAddress, Serialized
         /// <summary>
         /// TBD
         /// </summary>
-        /// <param name="msg">TBD</param>
-        /// <param name="cause">TBD</param>
-        /// <returns>TBD</returns>
         public IInternalActorRef Recipient { get; private set; }
 
         /// <summary>
diff --git a/src/core/Akka.Streams.Tests.Performance/FusedGraphsBenchmark.cs b/src/core/Akka.Streams.Tests.Performance/FusedGraphsBenchmark.cs
index 944680d258c..fbe90464864 100644
--- a/src/core/Akka.Streams.Tests.Performance/FusedGraphsBenchmark.cs
+++ b/src/core/Akka.Streams.Tests.Performance/FusedGraphsBenchmark.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+// <copyright file="FusedGraphsBenchmark.cs" company="Akka.NET Project">
+//     Copyright (C) 2015-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
 using System.Linq;
 using Akka.Actor;
 using Akka.Streams.Dsl;
diff --git a/src/core/Akka.Streams.Tests.Performance/JsonFramingBenchmark.cs b/src/core/Akka.Streams.Tests.Performance/JsonFramingBenchmark.cs
index ef34590c0d7..625c62a516f 100644
--- a/src/core/Akka.Streams.Tests.Performance/JsonFramingBenchmark.cs
+++ b/src/core/Akka.Streams.Tests.Performance/JsonFramingBenchmark.cs
@@ -1,4 +1,11 @@
-using Akka.IO;
+//-----------------------------------------------------------------------
+// <copyright file="JsonFramingBenchmark.cs" company="Akka.NET Project">
+//     Copyright (C) 2015-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using Akka.IO;
 using Akka.Streams.Implementation;
 using NBench;
 
diff --git a/src/core/Akka.Streams.Tests.TCK/AkkaSubscriberVerification.cs b/src/core/Akka.Streams.Tests.TCK/AkkaSubscriberVerification.cs
index 63dcaeea9cb..8ae904f9553 100644
--- a/src/core/Akka.Streams.Tests.TCK/AkkaSubscriberVerification.cs
+++ b/src/core/Akka.Streams.Tests.TCK/AkkaSubscriberVerification.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="AkkaSubscriberBlackboxVerification.cs" company="Akka.NET Project">
+// <copyright file="AkkaSubscriberVerification.cs" company="Akka.NET Project">
 //     Copyright (C) 2015-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/core/Akka.Streams.Tests.TCK/VirtualPublisherTest.cs b/src/core/Akka.Streams.Tests.TCK/VirtualPublisherTest.cs
index 01b2ad7a333..64f7cdf6596 100644
--- a/src/core/Akka.Streams.Tests.TCK/VirtualPublisherTest.cs
+++ b/src/core/Akka.Streams.Tests.TCK/VirtualPublisherTest.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="VirtualProcessorTest.cs" company="Akka.NET Project">
+// <copyright file="VirtualPublisherTest.cs" company="Akka.NET Project">
 //     Copyright (C) 2015-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/core/Akka.Streams.Tests/Dsl/FlowSelectAsyncUnorderedSpec.cs b/src/core/Akka.Streams.Tests/Dsl/FlowSelectAsyncUnorderedSpec.cs
index d16ddf22df1..c8c78907341 100644
--- a/src/core/Akka.Streams.Tests/Dsl/FlowSelectAsyncUnorderedSpec.cs
+++ b/src/core/Akka.Streams.Tests/Dsl/FlowSelectAsyncUnorderedSpec.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="FlowSelectAsyncUnorderedSpec .cs" company="Akka.NET Project">
+// <copyright file="FlowSelectAsyncUnorderedSpec.cs" company="Akka.NET Project">
 //     Copyright (C) 2015-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/core/Akka.Streams/Dsl/Hub.cs b/src/core/Akka.Streams/Dsl/Hub.cs
index 637e9165aff..8940182ad37 100644
--- a/src/core/Akka.Streams/Dsl/Hub.cs
+++ b/src/core/Akka.Streams/Dsl/Hub.cs
@@ -1,4 +1,11 @@
-using System;
+//-----------------------------------------------------------------------
+// <copyright file="Hub.cs" company="Akka.NET Project">
+//     Copyright (C) 2015-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/src/core/Akka.Streams/Implementation/UntypedVirtualPublisher.cs b/src/core/Akka.Streams/Implementation/UntypedVirtualPublisher.cs
index 1ee12411221..014f14a068c 100644
--- a/src/core/Akka.Streams/Implementation/UntypedVirtualPublisher.cs
+++ b/src/core/Akka.Streams/Implementation/UntypedVirtualPublisher.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="UntypedPublisher.cs" company="Akka.NET Project">
+// <copyright file="UntypedVirtualPublisher.cs" company="Akka.NET Project">
 //     Copyright (C) 2015-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
diff --git a/src/core/Akka.Streams/Stage/AbstractStage.cs b/src/core/Akka.Streams/Stage/AbstractStage.cs
index b3960926a98..06121420298 100644
--- a/src/core/Akka.Streams/Stage/AbstractStage.cs
+++ b/src/core/Akka.Streams/Stage/AbstractStage.cs
@@ -199,18 +199,14 @@ public FreeDirective PushAndPull(TOut element)
         /// <summary>
         /// TBD
         /// </summary>
-        /// <typeparam name="T2">TBD</typeparam>
-        /// <typeparam name="TMat2">TBD</typeparam>
-        /// <param name="flow">TBD</param>
+        /// <param name="element">TBD</param>
         /// <returns>TBD</returns>
         public IUpstreamDirective HoldUpstreamAndPush(object element) => HoldUpstreamAndPush((TOut) element);
 
         /// <summary>
         /// TBD
         /// </summary>
-        /// <typeparam name="T2">TBD</typeparam>
-        /// <typeparam name="TMat2">TBD</typeparam>
-        /// <param name="flow">TBD</param>
+        /// <param name="element">TBD</param>
         /// <returns>TBD</returns>
         public IUpstreamDirective HoldUpstreamAndPush(TOut element)
         {
@@ -221,9 +217,6 @@ public IUpstreamDirective HoldUpstreamAndPush(TOut element)
         /// <summary>
         /// TBD
         /// </summary>
-        /// <typeparam name="T2">TBD</typeparam>
-        /// <typeparam name="TMat2">TBD</typeparam>
-        /// <param name="flow">TBD</param>
         /// <returns>TBD</returns>
         public IDownstreamDirective HoldDownstreamAndPull()
         {
diff --git a/src/core/Akka.TestKit/TestKitBase_ActorOf.cs b/src/core/Akka.TestKit/TestKitBase_ActorOf.cs
index 8d9dc92ae6e..86ec8853b2c 100644
--- a/src/core/Akka.TestKit/TestKitBase_ActorOf.cs
+++ b/src/core/Akka.TestKit/TestKitBase_ActorOf.cs
@@ -153,7 +153,7 @@ public ActorSelection ActorSelection(string actorPath)
         /// <summary>
         ///  Creates an <see cref="ActorSelection(string)"/>
         ///  </summary>
-        /// <param name="anchorRef">The base actor that anchros the <see cref="actorPath"/>.</param>
+        /// <param name="anchorRef">The base actor that anchros the <paramref name="actorPath"/>.</param>
         /// <param name="actorPath">The path of the actor(s) we want to select.</param>
         /// <returns>An ActorSelection</returns>
         public ActorSelection ActorSelection(IActorRef anchorRef, string actorPath)
diff --git a/src/core/Akka.TestKit/TestProbe.cs b/src/core/Akka.TestKit/TestProbe.cs
index b938bdf2898..0eff06cea39 100644
--- a/src/core/Akka.TestKit/TestProbe.cs
+++ b/src/core/Akka.TestKit/TestProbe.cs
@@ -175,7 +175,7 @@ public void SendSystemMessage(ISystemMessage message)
         /// Compares the underlying actor ref to the object.
         /// </summary>
         /// <param name="obj">The object to be compared to; ideally an <see cref="IActorRef"/>.</param>
-        /// <returns>An integer indicating if the actor sorts higher, lower, or equal to <see cref="obj"/>.</returns>
+        /// <returns>An integer indicating if the actor sorts higher, lower, or equal to <paramref name="obj"/>.</returns>
         public int CompareTo(object obj)
         {
             return TestActor.CompareTo(obj);
diff --git a/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs b/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs
index 5da97cfac91..d6e69f81573 100644
--- a/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs
+++ b/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs
@@ -99,7 +99,7 @@ private static Bucket[] CreateWheel(int ticksPerWheel, ILoggingAdapter log)
         /// Normalize a wheel size to the nearest power of 2.
         /// </summary>
         /// <param name="ticksPerWheel">The original input per wheel.</param>
-        /// <returns><see cref="ticksPerWheel"/> normalized to the nearest power of 2.</returns>
+        /// <returns><paramref name="ticksPerWheel"/> normalized to the nearest power of 2.</returns>
         private static int NormalizeTicksPerWheel(int ticksPerWheel)
         {
             var normalizedTicksPerWheel = 1;
@@ -576,7 +576,7 @@ public void ClearReschedule(HashSet<SchedulerRegistration> registrations)
             private static readonly Action<object> ExecuteRunnableWithState = r => ((IRunnable)r).Run();
 
             /// <summary>
-            /// Execute all <see cref="SchedulerRegistration"/>s that are due by or after <see cref="deadline"/>.
+            /// Execute all <see cref="SchedulerRegistration"/>s that are due by or after <paramref name="deadline"/>.
             /// </summary>
             /// <param name="deadline">The execution time.</param>
             public void Execute(long deadline)
diff --git a/src/core/Akka/Akka.csproj b/src/core/Akka/Akka.csproj
index fdb0341355d..e4e7d515a06 100644
--- a/src/core/Akka/Akka.csproj
+++ b/src/core/Akka/Akka.csproj
@@ -285,6 +285,11 @@
     <Compile Include="Util\Internal\StringBuilderExtensions.cs" />
     <Compile Include="Util\Internal\TaskExtensions.cs" />
     <Compile Include="Util\ISurrogate.cs" />
+    <Compile Include="Util\MatchHandler\PartialHandlerArgumentsCapture.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>PartialHandlerArgumentsCapture.tt</DependentUpon>
+    </Compile>
     <Compile Include="Util\RuntimeDetector.cs" />
     <Compile Include="Util\MonotonicClock.cs" />
     <Compile Include="Util\Result.cs" />
@@ -349,7 +354,6 @@
     <Compile Include="Util\MatchHandler\MatchExpressionBuilderResult.cs" />
     <Compile Include="Util\MatchHandler\MatchExpressionBuilder.cs" />
     <Compile Include="Util\MatchHandler\PartialActionBuilder.cs" />
-    <Compile Include="Util\MatchHandler\PartialHandlerArgumentsCapture.cs" />
     <Compile Include="Util\MatchHandler\HandlerKind.cs" />
     <Compile Include="Util\MatchHandler\IMatchCompiler.cs" />
     <Compile Include="Util\MatchHandler\MatchBuilder.cs" />
@@ -381,8 +385,14 @@
     <Content Include="Akka.ExternalAnnotations.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Util\MatchHandler\PartialHandlerArgumentsCapture.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>PartialHandlerArgumentsCapture.cs</LastGenOutput>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </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. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/core/Akka/Configuration/Hocon/AkkaConfigurationSection.cs b/src/core/Akka/Configuration/Hocon/AkkaConfigurationSection.cs
index 92b921cc387..74e559accf2 100644
--- a/src/core/Akka/Configuration/Hocon/AkkaConfigurationSection.cs
+++ b/src/core/Akka/Configuration/Hocon/AkkaConfigurationSection.cs
@@ -43,6 +43,7 @@ public Config AkkaConfig
         /// Retrieves the HOCON (Human-Optimized Config Object Notation)
         /// configuration string from the custom akka node.
         /// <code>
+        /// <![CDATA[
         /// <?xml version="1.0" encoding="utf-8" ?>
         /// <configuration>
         ///   <configSections>
@@ -54,6 +55,7 @@ public Config AkkaConfig
         ///      </hocon>
         ///   </akka>
         /// </configuration>
+        /// ]]>
         /// </code>
         /// </summary>
         [ConfigurationProperty(ConfigurationPropertyName, IsRequired = true)]
diff --git a/src/core/Akka/Configuration/Hocon/CDataConfigurationElement.cs b/src/core/Akka/Configuration/Hocon/CDataConfigurationElement.cs
index 1f775411705..234652efbab 100644
--- a/src/core/Akka/Configuration/Hocon/CDataConfigurationElement.cs
+++ b/src/core/Akka/Configuration/Hocon/CDataConfigurationElement.cs
@@ -34,15 +34,15 @@ namespace Akka.Configuration.Hocon
     public abstract class CDataConfigurationElement : ConfigurationElement
     {
         /// <summary>
-        /// TBD
+        /// The name of the property that contains the content to deserialize.
         /// </summary>
         protected const string ContentPropertyName = "content";
 
         /// <summary>
         /// Deserializes the text located in a CDATA node of the configuration file.
         /// </summary>
-        /// <param name="reader">The <see cref="T:System.Xml.XmlReader" /> that reads from the configuration file.</param>
-        /// <param name="serializeCollectionKey">true to serialize only the collection key properties; otherwise, false.</param>
+        /// <param name="reader">The <see cref="System.Xml.XmlReader" /> that reads from the configuration file.</param>
+        /// <param name="serializeCollectionKey"><c>true</c> to serialize only the collection key properties; otherwise, <c>false</c>.</param>
         protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
         {
             foreach (ConfigurationProperty configurationProperty in Properties)
diff --git a/src/core/Akka/Configuration/Hocon/HoconTokenizer.cs b/src/core/Akka/Configuration/Hocon/HoconTokenizer.cs
index e9970caa974..07883ba8a2f 100644
--- a/src/core/Akka/Configuration/Hocon/HoconTokenizer.cs
+++ b/src/core/Akka/Configuration/Hocon/HoconTokenizer.cs
@@ -23,7 +23,7 @@ public class Tokenizer
         private readonly Stack<int> _indexStack = new Stack<int>();
 
         /// <summary>
-        /// TBD
+        /// Adds the current index to the tokenizer's bookkeeping stack.
         /// </summary>
         public void Push()
         {
@@ -31,7 +31,7 @@ public void Push()
         }
 
         /// <summary>
-        /// TBD
+        /// Removes an index from the tokenizer's bookkeeping stack. 
         /// </summary>
         public void Pop()
         {
@@ -455,18 +455,18 @@ public bool IsUnquotedKeyStart()
         }
 
         /// <summary>
-        /// TBD
+        /// Determines whether the current token is whitespace.
         /// </summary>
-        /// <returns>TBD</returns>
+        /// <returns><c>true</c> if token is whitespace; otherwise, <c>false</c>.</returns>
         public bool IsWhitespace()
         {
             return char.IsWhiteSpace(Peek());
         }
 
         /// <summary>
-        /// TBD
+        /// Determines whether the current token is whitespace or a comment.
         /// </summary>
-        /// <returns>TBD</returns>
+        /// <returns><c>true</c> if token is whitespace or a comment; otherwise, <c>false</c>.</returns>
         public bool IsWhitespaceOrComment()
         {
             return IsWhitespace() || IsStartOfComment();
@@ -585,9 +585,9 @@ private string PullEscapeSequence()
         }
 
         /// <summary>
-        /// TBD
+        /// Determines whether the current token is the start of a comment.
         /// </summary>
-        /// <returns>TBD</returns>
+        /// <returns><c>true</c> if token is the start of a comment; otherwise, <c>false</c>.</returns>
         public bool IsStartOfComment()
         {
             return (Matches("#", "//"));
@@ -649,10 +649,10 @@ public bool IsSubstitutionStart()
         }
 
         /// <summary>
-        /// TBD
+        /// Determines whether the current token is the start of an include directive.
         /// </summary>
         /// <exception cref="FormatException">This exception is thrown if an unknown escape code is encountered.</exception>
-        /// <returns>TBD</returns>
+        /// <returns><c>true</c> if token is the start of an include directive; otherwise, <c>false</c>.</returns>
         public bool IsInclude()
         {
             Push();
diff --git a/src/core/Akka/IO/ByteBuffer.cs b/src/core/Akka/IO/ByteBuffer.cs
index f71be9ed13f..0ab4577cc1f 100644
--- a/src/core/Akka/IO/ByteBuffer.cs
+++ b/src/core/Akka/IO/ByteBuffer.cs
@@ -182,7 +182,7 @@ public void Get(byte[] ar)
         /// <summary>
         /// TBD
         /// </summary>
-        /// <param name="srsc">TBD</param>
+        /// <param name="src">TBD</param>
         /// <param name="length">TBD</param>
         public void Put(ByteBuffer src, int length)
         {
diff --git a/src/core/Akka/IO/Inet.cs b/src/core/Akka/IO/Inet.cs
index c4f6655f7b8..7bc71421d05 100644
--- a/src/core/Akka/IO/Inet.cs
+++ b/src/core/Akka/IO/Inet.cs
@@ -177,8 +177,6 @@ public override void BeforeConnect(Socket s)
             /// <summary>
             /// TBD
             /// </summary>
-            /// <param name="token">TBD</param>
-            /// <returns>TBD</returns>
             public class SendBufferSize : SocketOption
             {
                 private readonly int _size;
diff --git a/src/core/Akka/IO/Tcp.cs b/src/core/Akka/IO/Tcp.cs
index 85b2b96c2e1..541fa27aa67 100644
--- a/src/core/Akka/IO/Tcp.cs
+++ b/src/core/Akka/IO/Tcp.cs
@@ -417,8 +417,6 @@ public static WriteCommand Create(params WriteCommand[] writes)
         /// <summary>
         /// TBD
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
         public abstract class SimpleWriteCommand : WriteCommand
         {
             /// <summary>
diff --git a/src/core/Akka/Routing/Broadcast.cs b/src/core/Akka/Routing/Broadcast.cs
index 3be21f3a9ee..5384dc373b9 100644
--- a/src/core/Akka/Routing/Broadcast.cs
+++ b/src/core/Akka/Routing/Broadcast.cs
@@ -92,10 +92,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Used by the <see cref="RoutedActorCell" /> to determine the initial number of routees.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>The number of routees associated with this pool.</returns>
         public override int GetNrOfInstances(ActorSystem system)
         {
             return NrOfInstances;
@@ -283,9 +283,12 @@ public BroadcastGroup(IEnumerable<string> paths)
         }
 
         /// <summary>
-        /// TBD
+        /// Obsolete. Use <see cref="BroadcastGroup(IEnumerable{System.String})"/> instead.
+        /// <code>
+        /// new BroadcastGroup(actorRefs.Select(c => c.Path.ToString()))
+        /// </code>
         /// </summary>
-        /// <param name="routees">TBD</param>
+        /// <param name="routees">N/A</param>
         [Obsolete("Use new BroadcastGroup(actorRefs.Select(c => c.Path.ToString())) instead")]
         public BroadcastGroup(IEnumerable<IActorRef> routees)
             : this(routees.Select(c => c.Path.ToString()))
@@ -302,10 +305,10 @@ public BroadcastGroup(IEnumerable<string> paths, string routerDispatcher) : base
         }
 
         /// <summary>
-        /// TBD
+        /// Retrieves the actor paths used by this router during routee selection.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>An enumeration of actor paths used during routee selection</returns>
         public override IEnumerable<string> GetPaths(ActorSystem system)
         {
             return Paths;
diff --git a/src/core/Akka/Routing/ConsistentHash.cs b/src/core/Akka/Routing/ConsistentHash.cs
index df59fd0d2a4..4319b91188c 100644
--- a/src/core/Akka/Routing/ConsistentHash.cs
+++ b/src/core/Akka/Routing/ConsistentHash.cs
@@ -24,7 +24,7 @@ namespace Akka.Routing
     /// Note that toString of the ring nodes are used for the node
     /// hash, i.e. make sure it is different for different nodes.
     /// </summary>
-    /// <typeparam name="T">TBD</typeparam>
+    /// <typeparam name="T">The type of objects to store in the hash.</typeparam>
     public class ConsistentHash<T>
     {
         private readonly SortedDictionary<int, T> _nodes;
@@ -47,38 +47,30 @@ public ConsistentHash(SortedDictionary<int, T> nodes, int virtualNodesFactor)
             _virtualNodesFactor = virtualNodesFactor;
         }
 
-        /// <summary>
-        /// arrays for fast binary search access
-        /// </summary>
         private Tuple<int[], T[]> _ring = null;
         private Tuple<int[], T[]> RingTuple
         {
             get { return _ring ?? (_ring = Tuple.Create(_nodes.Keys.ToArray(), _nodes.Values.ToArray())); }
         }
 
-        /// <summary>
-        /// Sorted hash values of the nodes
-        /// </summary>
         private int[] NodeHashRing
         {
             get { return RingTuple.Item1; }
         }
 
-        /// <summary>
-        /// NodeRing is the nodes sorted in the same order as <see cref="NodeHashRing"/>, i.e. same index
-        /// </summary>
         private T[] NodeRing
         {
             get { return RingTuple.Item2; }
         }
 
         /// <summary>
-        /// Add a node to the hash ring.
+        /// Adds a node to the hash ring.
         /// 
         /// Note that <see cref="ConsistentHash{T}"/> is immutable and
         /// this operation returns a new instance.
         /// </summary>
-        /// <param name="node">TBD</param>
+        /// <param name="node">The node to add to the hash ring</param>
+        /// <returns>A new instance of this hash ring with the given node added.</returns>
         public ConsistentHash<T> Add(T node)
         {
             return this + node;
@@ -90,18 +82,13 @@ public ConsistentHash<T> Add(T node)
         /// Note that <see cref="ConsistentHash{T}"/> is immutable and
         /// this operation returns a new instance.
         /// </summary>
-        /// <param name="node">TBD</param>
+        /// <param name="node">The node to remove from the hash ring</param>
+        /// <returns>A new instance of this hash ring with the given node removed.</returns>
         public ConsistentHash<T> Remove(T node)
         {
             return this - node;
         }
 
-        /// <summary>
-        /// Converts the result of <see cref="Array.BinarySearch{T}(T[], T)"/> into an index in the 
-        /// <see cref="RingTuple"/> array.
-        /// </summary>
-        /// <param name="i">TBD</param>
-        /// <returns>TBD</returns>
         private int Idx(int i)
         {
             if (i >= 0) return i; //exact match
@@ -114,14 +101,13 @@ private int Idx(int i)
         }
 
         /// <summary>
-        /// Get the node responsible for the data key.
-        /// Can only be used if nodes exist in the node ring.
+        /// Retrieves the node associated with the data key.
         /// </summary>
-        /// <param name="key">TBD</param>
+        /// <param name="key">The data key used for lookup.</param>
         /// <exception cref="InvalidOperationException">
         /// This exception is thrown if the node ring is empty.
         /// </exception>
-        /// <returns>TBD</returns>
+        /// <returns>The node associated with the data key</returns>
         public T NodeFor(byte[] key)
         {
             if (IsEmpty) throw new InvalidOperationException($"Can't get node for [{key}] from an empty node ring");
@@ -130,14 +116,13 @@ public T NodeFor(byte[] key)
         }
 
         /// <summary>
-        /// Get the node responsible for the data key.
-        /// Can only be used if nodes exist in the node ring.
+        /// Retrieves the node associated with the data key.
         /// </summary>
-        /// <param name="key">TBD</param>
+        /// <param name="key">The data key used for lookup.</param>
         /// <exception cref="InvalidOperationException">
         /// This exception is thrown if the node ring is empty.
         /// </exception>
-        /// <returns>TBD</returns>
+        /// <returns>The node associated with the data key</returns>
         public T NodeFor(string key)
         {
             if (IsEmpty) throw new InvalidOperationException($"Can't get node for [{key}] from an empty node ring");
@@ -146,7 +131,7 @@ public T NodeFor(string key)
         }
 
         /// <summary>
-        /// Is the node ring empty? i.e. no nodes added or all removed
+        /// Check to determine if the node ring is empty (i.e. no nodes added or all removed)
         /// </summary>
         public bool IsEmpty
         {
@@ -154,39 +139,38 @@ public bool IsEmpty
         }
 
         /// <summary>
-        /// TBD
+        /// This class represents a surrogate of a <see cref="ConsistentHashingGroup"/> router.
+        /// Its main use is to help during the serialization process.
         /// </summary>
         public class ConsistentHashingGroupSurrogate : ISurrogate
         {
             /// <summary>
-            /// TBD
+            /// Creates a <see cref="ConsistentHashingGroup"/> encapsulated by this surrogate.
             /// </summary>
-            /// <param name="system">TBD</param>
-            /// <returns>TBD</returns>
+            /// <param name="system">The actor system that owns this router.</param>
+            /// <returns>The <see cref="ConsistentHashingGroup"/> encapsulated by this surrogate.</returns>
             public ISurrogated FromSurrogate(ActorSystem system)
             {
                 return new ConsistentHashingGroup(Paths);
             }
 
             /// <summary>
-            /// TBD
+            /// The actor paths used by this router during routee selection.
             /// </summary>
             public string[] Paths { get; set; }
         }
 
-
-
         #region Operator overloads
 
         /// <summary>
-        /// Add a node to the hash ring.
+        /// Adds a node to the hash ring.
         /// 
         /// Note that <see cref="ConsistentHash{T}"/> is immutable and
         /// this operation returns a new instance.
         /// </summary>
-        /// <param name="hash">TBD</param>
-        /// <param name="node">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="hash">The hash ring used to derive a new ring with the given node added.</param>
+        /// <param name="node">The node to add to the hash ring</param>
+        /// <returns>A new instance of this hash ring with the given node added.</returns>
         public static ConsistentHash<T> operator +(ConsistentHash<T> hash, T node)
         {
             var nodeHash = ConsistentHash.HashFor(node.ToString());
@@ -200,9 +184,9 @@ public ISurrogated FromSurrogate(ActorSystem system)
         /// Note that <see cref="ConsistentHash{T}"/> is immutable and
         /// this operation returns a new instance.
         /// </summary>
-        /// <param name="hash">TBD</param>
-        /// <param name="node">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="hash">The hash ring used to derive a new ring with the given node removed.</param>
+        /// <param name="node">The node to remove from the hash ring</param>
+        /// <returns>A new instance of this hash ring with the given node removed.</returns>
         public static ConsistentHash<T> operator -(ConsistentHash<T> hash, T node)
         {
             var nodeHash = ConsistentHash.HashFor(node.ToString());
@@ -259,40 +243,42 @@ internal static int ConcatenateNodeHash(int nodeHash, int vnode)
         }
 
         /// <summary>
-        /// TBD
+        /// This class represents a surrogate of a <see cref="ConsistentHashingPool"/> router.
+        /// Its main use is to help during the serialization process.
         /// </summary>
         public class ConsistentHashingPoolSurrogate : ISurrogate
         {
             /// <summary>
-            /// TBD
+            /// Creates a <see cref="ConsistentHashingPool"/> encapsulated by this surrogate.
             /// </summary>
-            /// <param name="system">TBD</param>
-            /// <returns>TBD</returns>
+            /// <param name="system">The actor system that owns this router.</param>
+            /// <returns>The <see cref="ConsistentHashingPool"/> encapsulated by this surrogate.</returns>
             public ISurrogated FromSurrogate(ActorSystem system)
             {
                 return new ConsistentHashingPool(NrOfInstances, Resizer, SupervisorStrategy, RouterDispatcher, UsePoolDispatcher);
             }
 
             /// <summary>
-            /// TBD
+            /// The number of routees associated with this pool.
             /// </summary>
-            public int NrOfInstances { get; set; }
+             public int NrOfInstances { get; set; }
             /// <summary>
-            /// TBD
+            /// Determine whether or not to use the pool dispatcher. The dispatcher is defined in the
+            /// 'pool-dispatcher' configuration property in the deployment section of the router.
             /// </summary>
-            public bool UsePoolDispatcher { get; set; }
+             public bool UsePoolDispatcher { get; set; }
             /// <summary>
-            /// TBD
+            /// The resizer to use when dynamically allocating routees to the pool.
             /// </summary>
-            public Resizer Resizer { get; set; }
+             public Resizer Resizer { get; set; }
             /// <summary>
-            /// TBD
+            /// The strategy to use when supervising the pool.
             /// </summary>
-            public SupervisorStrategy SupervisorStrategy { get; set; }
+             public SupervisorStrategy SupervisorStrategy { get; set; }
             /// <summary>
-            /// TBD
+            /// The dispatcher to use when passing messages to the routees.
             /// </summary>
-            public string RouterDispatcher { get; set; }
+             public string RouterDispatcher { get; set; }
         }
 
         /// <summary>
@@ -303,34 +289,34 @@ public ISurrogated FromSurrogate(ActorSystem system)
         /// <returns>The object encoded into bytes - in the case of custom classes, the hashcode may be used.</returns>
         internal static object ToBytesOrObject(object obj)
         {
-                if (obj == null)
-                    return new byte[] { 0 };
-                if (obj is byte[])
-                    return (byte[])obj;
-                if (obj is int)
-                    return BitConverter.GetBytes((int)obj);
-                if (obj is uint)
-                    return BitConverter.GetBytes((uint)obj);
-                if (obj is short)
-                    return BitConverter.GetBytes((short)obj);
-                if (obj is ushort)
-                    return BitConverter.GetBytes((ushort)obj);
-                if (obj is bool)
-                    return BitConverter.GetBytes((bool)obj);
-                if (obj is long)
-                    return BitConverter.GetBytes((long)obj);
-                if (obj is ulong)
-                    return BitConverter.GetBytes((ulong)obj);
-                if (obj is char)
-                    return BitConverter.GetBytes((char)obj);
-                if (obj is float)
-                    return BitConverter.GetBytes((float)obj);
-                if (obj is double)
-                    return BitConverter.GetBytes((double)obj);
-                if (obj is decimal)
-                    return new BitArray(decimal.GetBits((decimal)obj)).ToBytes();
-                if (obj is Guid)
-                    return ((Guid)obj).ToByteArray();
+            if (obj == null)
+                return new byte[] { 0 };
+            if (obj is byte[])
+                return (byte[])obj;
+            if (obj is int)
+                return BitConverter.GetBytes((int)obj);
+            if (obj is uint)
+                return BitConverter.GetBytes((uint)obj);
+            if (obj is short)
+                return BitConverter.GetBytes((short)obj);
+            if (obj is ushort)
+                return BitConverter.GetBytes((ushort)obj);
+            if (obj is bool)
+                return BitConverter.GetBytes((bool)obj);
+            if (obj is long)
+                return BitConverter.GetBytes((long)obj);
+            if (obj is ulong)
+                return BitConverter.GetBytes((ulong)obj);
+            if (obj is char)
+                return BitConverter.GetBytes((char)obj);
+            if (obj is float)
+                return BitConverter.GetBytes((float)obj);
+            if (obj is double)
+                return BitConverter.GetBytes((double)obj);
+            if (obj is decimal)
+                return new BitArray(decimal.GetBits((decimal)obj)).ToBytes();
+            if (obj is Guid)
+                return ((Guid)obj).ToByteArray();
             return obj;
         }
 
diff --git a/src/core/Akka/Routing/ConsistentHashRouter.cs b/src/core/Akka/Routing/ConsistentHashRouter.cs
index 16d4f08fd84..c531b6cebef 100644
--- a/src/core/Akka/Routing/ConsistentHashRouter.cs
+++ b/src/core/Akka/Routing/ConsistentHashRouter.cs
@@ -262,6 +262,11 @@ public ConsistentHashingRoutingLogic WithHashMapping(ConsistentHashMapping mappi
     /// </summary>
     internal sealed class ConsistentRoutee
     {
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <param name="routee">TBD</param>
+        /// <param name="selfAddress">TBD</param>
         public ConsistentRoutee(Routee routee, Address selfAddress)
         {
             SelfAddress = selfAddress;
@@ -410,10 +415,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Used by the <see cref="RoutedActorCell" /> to determine the initial number of routees.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>The number of routees associated with this pool.</returns>
         public override int GetNrOfInstances(ActorSystem system)
         {
             return this.NrOfInstances;
@@ -654,9 +659,12 @@ public ConsistentHashingGroup(IEnumerable<string> paths)
         }
 
         /// <summary>
-        /// TBD
+        /// Obsolete. Use <see cref="ConsistentHashingGroup(IEnumerable{System.String})"/> instead.
+        /// <code>
+        /// new ConsistentHashingGroup(actorRefs.Select(c => c.Path.ToString()))
+        /// </code>
         /// </summary>
-        /// <param name="routees">TBD</param>
+        /// <param name="routees">N/A</param>
         [Obsolete("Use new ConsistentHashingGroup(actorRefs.Select(c => c.Path.ToString())) instead")]
         public ConsistentHashingGroup(IEnumerable<IActorRef> routees)
             : this(routees.Select(c => c.Path.ToString()))
@@ -699,10 +707,10 @@ public ConsistentHashingGroup(
         public int VirtualNodesFactor { get; private set; }
 
         /// <summary>
-        /// TBD
+        /// Retrieves the actor paths used by this router during routee selection.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>An enumeration of actor paths used during routee selection</returns>
         public override IEnumerable<string> GetPaths(ActorSystem system)
         {
             return Paths;
diff --git a/src/core/Akka/Routing/Random.cs b/src/core/Akka/Routing/Random.cs
index a09e5e550cb..8373898c303 100644
--- a/src/core/Akka/Routing/Random.cs
+++ b/src/core/Akka/Routing/Random.cs
@@ -92,10 +92,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Used by the <see cref="RoutedActorCell" /> to determine the initial number of routees.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>The number of routees associated with this pool.</returns>
         public override int GetNrOfInstances(ActorSystem system)
         {
             return NrOfInstances;
@@ -294,10 +294,10 @@ public RandomGroup(IEnumerable<string> paths, string routerDispatcher)
         }
 
         /// <summary>
-        /// TBD
+        /// Retrieves the actor paths used by this router during routee selection.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>An enumeration of actor paths used during routee selection</returns>
         public override IEnumerable<string> GetPaths(ActorSystem system)
         {
             return Paths;
diff --git a/src/core/Akka/Routing/RoundRobin.cs b/src/core/Akka/Routing/RoundRobin.cs
index 8647ac4c4f7..dc88daa3df8 100644
--- a/src/core/Akka/Routing/RoundRobin.cs
+++ b/src/core/Akka/Routing/RoundRobin.cs
@@ -139,10 +139,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Used by the <see cref="RoutedActorCell"/> to determine the initial number of routees.
         /// </summary>
-        /// <param name="sys">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="sys">The actor system that owns this router.</param>
+        /// <returns>The number of routees associated with this pool.</returns>
         public override int GetNrOfInstances(ActorSystem sys)
         {
             return NrOfInstances;
@@ -338,9 +338,9 @@ public RoundRobinGroup(IEnumerable<string> paths) : this(paths, Dispatchers.Defa
         }
 
         /// <summary>
-        /// TBD
+        /// Obsolete. Use <see cref="RoundRobinGroup(IEnumerable{System.String})"/> instead.
         /// </summary>
-        /// <param name="routees">TBD</param>
+        /// <param name="routees">N/A</param>
         [Obsolete("Use RoundRobinGroup constructor with IEnumerable<string> parameter")]
         public RoundRobinGroup(IEnumerable<IActorRef> routees)
             : this(routees.Select(c => c.Path.ToString()))
@@ -358,10 +358,10 @@ public RoundRobinGroup(IEnumerable<string> paths, string routerDispatcher)
         }
 
         /// <summary>
-        /// TBD
+        /// Retrieves the actor paths used by this router during routee selection.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>An enumeration of actor paths used during routee selection</returns>
         public override IEnumerable<string> GetPaths(ActorSystem system)
         {
             return Paths;
diff --git a/src/core/Akka/Routing/RouterConfig.cs b/src/core/Akka/Routing/RouterConfig.cs
index 6e18c70a1d6..fa6d764e2f8 100644
--- a/src/core/Akka/Routing/RouterConfig.cs
+++ b/src/core/Akka/Routing/RouterConfig.cs
@@ -132,10 +132,10 @@ public bool Equals(RouterConfig other)
         }
 
         /// <summary>
-        /// TBD
+        /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
         /// </summary>
-        /// <param name="obj">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param>
+        /// <returns><c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.</returns>
         public override bool Equals(object obj)
         {
             return Equals(obj as RouterConfig);
@@ -168,8 +168,8 @@ protected Group(IEnumerable<string> paths, string routerDispatcher) : base(route
         /// <summary>
         /// Retrieves the actor paths used by this router during routee selection.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>An enumeration of actor paths used during routee selection</returns>
         public abstract IEnumerable<string> GetPaths(ActorSystem system);
 
         /// <summary>
@@ -273,14 +273,14 @@ protected Pool(
         }
 
         /// <summary>
-        /// TBD
+        /// Retrieves the current number of routees in the pool.
         /// </summary>
         public int NrOfInstances { get; }
 
         /// <summary>
         /// Used by the <see cref="RoutedActorCell"/> to determine the initial number of routees.
         /// </summary>
-        /// <param name="system">TBD</param>
+        /// <param name="system">The actor system that owns this router.</param>
         /// <returns>The number of routees associated with this pool.</returns>
         public abstract int GetNrOfInstances(ActorSystem system);
 
diff --git a/src/core/Akka/Routing/ScatterGatherFirstCompleted.cs b/src/core/Akka/Routing/ScatterGatherFirstCompleted.cs
index 1df2fa4d1e2..fcac9fea623 100644
--- a/src/core/Akka/Routing/ScatterGatherFirstCompleted.cs
+++ b/src/core/Akka/Routing/ScatterGatherFirstCompleted.cs
@@ -198,10 +198,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Used by the <see cref="RoutedActorCell" /> to determine the initial number of routees.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>The number of routees associated with this pool.</returns>
         public override int GetNrOfInstances(ActorSystem system)
         {
             return NrOfInstances;
@@ -412,11 +412,13 @@ public ScatterGatherFirstCompletedGroup(IEnumerable<string> paths, TimeSpan with
         }
 
         /// <summary>
-        /// TBD
+        /// Obsolete. Use <see cref="ScatterGatherFirstCompletedGroup(IEnumerable{System.String}, TimeSpan)"/> instead.
+        /// <code>
+        /// new ScatterGatherFirstCompletedGroup(actorRefs.Select(c => c.Path.ToString()), within)
+        /// </code>
         /// </summary>
-        /// <param name="routees">TBD</param>
-        /// <param name="within">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="routees">N/A</param>
+        /// <param name="within">N/A</param>
         [Obsolete("Use new ScatterGatherFirstCompletedGroup(actorRefs.Select(c => c.Path.ToString()), within) instead")]
         public ScatterGatherFirstCompletedGroup(IEnumerable<IActorRef> routees, TimeSpan within)
             : this(routees.Select(c => c.Path.ToString()), within, Dispatchers.DefaultDispatcherId)
@@ -450,10 +452,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Retrieves the actor paths used by this router during routee selection.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>An enumeration of actor paths used during routee selection</returns>
         public override IEnumerable<string> GetPaths(ActorSystem system)
         {
             return Paths;
diff --git a/src/core/Akka/Routing/SmallestMailbox.cs b/src/core/Akka/Routing/SmallestMailbox.cs
index 11e80c301c3..6295ffa5e2b 100644
--- a/src/core/Akka/Routing/SmallestMailbox.cs
+++ b/src/core/Akka/Routing/SmallestMailbox.cs
@@ -167,10 +167,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Used by the <see cref="RoutedActorCell" /> to determine the initial number of routees.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>The number of routees associated with this pool.</returns>
         public override int GetNrOfInstances(ActorSystem system)
         {
             return NrOfInstances;
diff --git a/src/core/Akka/Routing/TailChopping.cs b/src/core/Akka/Routing/TailChopping.cs
index 5563295cf6c..eb9d2df5661 100644
--- a/src/core/Akka/Routing/TailChopping.cs
+++ b/src/core/Akka/Routing/TailChopping.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="TailChoppingRoutingLogic.cs" company="Akka.NET Project">
+// <copyright file="TailChopping.cs" company="Akka.NET Project">
 //     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
 // </copyright>
@@ -199,7 +199,7 @@ public TailChoppingPool(int nrOfInstances, Resizer resizer, SupervisorStrategy s
         public TimeSpan Within { get; }
 
         /// <summary>
-        /// TBD
+        /// The amount of time to wait before sending to the next routee.
         /// </summary>
         public TimeSpan Interval { get; }
 
@@ -214,10 +214,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Used by the <see cref="RoutedActorCell" /> to determine the initial number of routees.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>The number of routees associated with this pool.</returns>
         public override int GetNrOfInstances(ActorSystem system)
         {
             return NrOfInstances;
@@ -445,7 +445,7 @@ public TailChoppingGroup(
         public TimeSpan Within { get; }
 
         /// <summary>
-        /// TBD
+        /// The amount of time to wait before sending to the next routee.
         /// </summary>
         public TimeSpan Interval { get; }
 
@@ -461,10 +461,10 @@ public override Router CreateRouter(ActorSystem system)
         }
 
         /// <summary>
-        /// TBD
+        /// Retrieves the actor paths used by this router during routee selection.
         /// </summary>
-        /// <param name="system">TBD</param>
-        /// <returns>TBD</returns>
+        /// <param name="system">The actor system that owns this router.</param>
+        /// <returns>An enumeration of actor paths used during routee selection</returns>
         public override IEnumerable<string> GetPaths(ActorSystem system)
         {
             return Paths;
@@ -515,13 +515,19 @@ public ISurrogated FromSurrogate(ActorSystem system)
                 return new TailChoppingGroup(Paths, Within, Interval, Dispatchers.DefaultDispatcherId);
             }
 
+            /// <summary>
             /// The actor paths used by this router during routee selection.
+            /// </summary>
             public IEnumerable<string> Paths { get; set; }
 
+            /// <summary>
             /// The amount of time to wait for a response.
+            /// </summary>
             public TimeSpan Within { get; set; }
 
+            /// <summary>
             /// The interval to wait before sending to the next routee.
+            /// </summary>
             public TimeSpan Interval { get; set; }
 
             /// <summary>
diff --git a/src/core/Akka/Util/ByteString.cs b/src/core/Akka/Util/ByteString.cs
index ef3b388c8bc..c83a10f87ec 100644
--- a/src/core/Akka/Util/ByteString.cs
+++ b/src/core/Akka/Util/ByteString.cs
@@ -915,7 +915,6 @@ public static CompactByteString FromString(string str, Encoding encoding)
         /// <summary>
         /// TBD
         /// </summary>
-        /// <param name="map">TBD</param>
         /// <param name="array">TBD</param>
         /// <param name="offset">TBD</param>
         /// <param name="length">TBD</param>
@@ -987,7 +986,6 @@ protected Func<Action<byte[], int>, ByteStringBuilder> FillArray(int len)
         /// <summary>
         /// TBD
         /// </summary>
-        /// <param name="map">TBD</param>
         /// <param name="len">TBD</param>
         /// <param name="byteOrder">TBD</param>
         /// <param name="fill">TBD</param>
diff --git a/src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.cs b/src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.cs
index 1ad4b6ddc84..2aa4d21e58d 100644
--- a/src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.cs
+++ b/src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.cs
@@ -1,4 +1,5 @@
-//-----------------------------------------------------------------------
+// --- auto generated: 1/27/2017 10:09:00 PM --- //
+//-----------------------------------------------------------------------
 // <copyright file="PartialHandlerArgumentsCapture.cs" company="Akka.NET Project">
 //     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
 //     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
@@ -10,11 +11,6 @@
 
 namespace Akka.Tools.MatchHandler
 {
-    //public interface IPartialHandler<in T>
-    //{
-    //    bool Handle(T value);
-    //}
-
     /// <summary>
     /// TBD
     /// </summary>
@@ -48,7 +44,6 @@ public sealed class PartialHandlerArgumentsCapture<T> : IPartialHandlerArguments
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 1);
             _handler = (Func<object, bool>)handler;
         }
 
@@ -74,11 +69,9 @@ public sealed class PartialHandlerArgumentsCapture<T, T1> : IPartialHandlerArgum
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 1);
             _handler = (Func<object, T1, bool>)handler;
             _1 = (T1)arguments[0];
         }
-
         private Func<object, T1, bool> _handler;
         private T1 _1;
         /// <summary>
@@ -103,7 +96,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2> : IPartialHandlerA
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 2);
             _handler = (Func<object, T1, T2, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -134,7 +126,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3> : IPartialHand
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 3);
             _handler = (Func<object, T1, T2, T3, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -168,7 +159,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4> : IPartial
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 4);
             _handler = (Func<object, T1, T2, T3, T4, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -205,7 +195,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5> : IPar
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 5);
             _handler = (Func<object, T1, T2, T3, T4, T5, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -245,7 +234,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6> :
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 6);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -288,7 +276,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 7);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -334,7 +321,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 8);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -383,7 +369,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 9);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, T9, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -435,7 +420,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 10);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -490,7 +474,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 11);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -548,7 +531,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 12);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -609,7 +591,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 13);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -673,7 +654,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 14);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -740,7 +720,6 @@ public sealed class PartialHandlerArgumentsCapture<T, T1, T2, T3, T4, T5, T6, T7
         /// <param name="arguments">TBD</param>
         public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         {
-            //CheckParameters(handler, arguments, 15);
             _handler = (Func<object, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, bool>)handler;
             _1 = (T1)arguments[0];
             _2 = (T2)arguments[1];
@@ -777,10 +756,8 @@ public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
         /// <summary>
         /// TBD
         /// </summary>
-        /// <param name="message">TBD</param>
+        /// <param name="value">TBD</param>
         /// <returns>TBD</returns>
-        public bool Handle(T message) { return _handler(message, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15); }
+        public bool Handle(T value) { return _handler(value, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15); }
     }
-
-}
-
+}
\ No newline at end of file
diff --git a/src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.tt b/src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.tt
new file mode 100644
index 00000000000..02d5b5c6c51
--- /dev/null
+++ b/src/core/Akka/Util/MatchHandler/PartialHandlerArgumentsCapture.tt
@@ -0,0 +1,102 @@
+<#@ template debug="false" hostspecific="false" language="C#" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="System.Linq" #>
+<#@ import namespace="System.Text" #>
+<#@ import namespace="System.Collections.Generic" #>
+<#@ output extension=".cs" #>
+// --- auto generated: <#= System.DateTime.UtcNow.ToString() #> --- //
+//-----------------------------------------------------------------------
+// <copyright file="PartialHandlerArgumentsCapture.cs" company="Akka.NET Project">
+//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
+//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+<# var count = 15; #>
+
+namespace Akka.Tools.MatchHandler
+{
+    /// <summary>
+    /// TBD
+    /// </summary>
+    /// <typeparam name="T">TBD</typeparam>
+    public interface IPartialHandlerArgumentsCapture<T>
+    {
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <param name="handler">TBD</param>
+        /// <param name="arguments">TBD</param>
+        /// <returns>TBD</returns>
+        void Initialize(Delegate handler, IReadOnlyList<object> arguments);
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <param name="message">TBD</param>
+        /// <returns>TBD</returns>
+        bool Handle(T message);
+    }
+    /// <summary>
+    /// TBD
+    /// </summary>
+    /// <typeparam name="T">TBD</typeparam>
+    public sealed class PartialHandlerArgumentsCapture<T> : IPartialHandlerArgumentsCapture<T>
+    {
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <param name="handler">TBD</param>
+        /// <param name="arguments">TBD</param>
+        public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
+        {
+            _handler = (Func<object, bool>)handler;
+        }
+
+        private Func<object, bool> _handler;
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <param name="value">TBD</param>
+        /// <returns>TBD</returns>
+        public bool Handle(T value) { return _handler(value); }
+    }
+<# for (int i = 1; i <= count; i++) {
+    var types = string.Join(", ", Enumerable.Range(1, i).Select(x => "T" + x));
+    var arguments = string.Join(", ", Enumerable.Range(1, i).Select(x => "_" + x));
+#>
+    /// <summary>
+    /// TBD
+    /// </summary>
+    /// <typeparam name="T">TBD</typeparam>
+<# for (var t = 1; t <= i; t++) { #>
+    /// <typeparam name="T<#= t #>">TBD</typeparam>
+<# } #>
+    public sealed class PartialHandlerArgumentsCapture<T, <#= types #>> : IPartialHandlerArgumentsCapture<T>
+    {
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <param name="handler">TBD</param>
+        /// <param name="arguments">TBD</param>
+        public void Initialize(Delegate handler, IReadOnlyList<object> arguments)
+        {
+            _handler = (Func<object, <#= types #>, bool>)handler;
+<# for (var t = 1; t <= i; t++) { #>
+            <#= "_" + t #> = <#= "(T" + t + ")" #>arguments[<#= t - 1 #>];
+<# } #>
+        }
+        private Func<object, <#= types #>, bool> _handler;
+<# for (var t = 1; t <= i; t++) { #>
+        private <#= "T" + t #> _<#= t #>;
+<# } #>
+        /// <summary>
+        /// TBD
+        /// </summary>
+        /// <param name="value">TBD</param>
+        /// <returns>TBD</returns>
+        public bool Handle(T value) { return _handler(value, <#= arguments #>); }
+    }
+<# } #>
+}
\ No newline at end of file
diff --git a/src/core/Akka/Util/MonotonicClock.cs b/src/core/Akka/Util/MonotonicClock.cs
index d284b015544..e3066b0b8ea 100644
--- a/src/core/Akka/Util/MonotonicClock.cs
+++ b/src/core/Akka/Util/MonotonicClock.cs
@@ -15,9 +15,6 @@ namespace Akka.Util
     /// <summary>
     /// TBD
     /// </summary>
-    /// <typeparam name="T">TBD</typeparam>
-    /// <param name="value">TBD</param>
-    /// <returns>TBD</returns>
     internal static class MonotonicClock
     {
         private static readonly Stopwatch Stopwatch = Stopwatch.StartNew();