diff --git a/src/Shmuelie.WinRTServer/ComServer.cs b/src/Shmuelie.WinRTServer/ComServer.cs
index 04a9ff9..36b242f 100644
--- a/src/Shmuelie.WinRTServer/ComServer.cs
+++ b/src/Shmuelie.WinRTServer/ComServer.cs
@@ -16,6 +16,20 @@ namespace Shmuelie.WinRTServer;
 /// <summary>
 /// An Out of Process COM Server.
 /// </summary>
+/// <remarks>
+/// <para>Allows for types to be created using COM activation instead of WinRT activation like <see cref="WinRtServer"/>.</para>
+/// <para>Typical usage is to call from an <see langword="await"/> <see langword="using"/> block, using <see cref="WaitForFirstObjectAsync"/> to not close until it is safe to do so.</para>
+/// <code language="cs">
+/// <![CDATA[
+/// await using (ComServer server = new ComServer())
+/// {
+///     server.RegisterClass<RemoteThing, IRemoteThing>();
+///     server.Start();
+///     await server.WaitForFirstObjectAsync();
+/// }
+/// ]]>
+/// </code>
+/// </remarks>
 /// <see cref="IAsyncDisposable"/>
 /// <threadsafety static="true" instance="false"/>
 [SupportedOSPlatform("windows6.0.6000")]
@@ -197,6 +211,7 @@ private void Factory_InstanceCreated(object? sender, InstanceCreatedEventArgs e)
     /// <summary>
     /// Starts the server.
     /// </summary>
+    /// <remarks>Calling <see cref="Start"/> is non-blocking.</remarks>
     /// <exception cref="ObjectDisposedException">The instance is disposed.</exception>
     public void Start()
     {
diff --git a/src/Shmuelie.WinRTServer/WinRtServer.cs b/src/Shmuelie.WinRTServer/WinRtServer.cs
index fb2e35c..971fc31 100644
--- a/src/Shmuelie.WinRTServer/WinRtServer.cs
+++ b/src/Shmuelie.WinRTServer/WinRtServer.cs
@@ -18,11 +18,28 @@ namespace Shmuelie.WinRTServer;
 /// <summary>
 /// An Out of Process Windows Runtime Server.
 /// </summary>
+/// <remarks>
+/// <para>Allows for types to be created using WinRT activation instead of COM activation like <see cref="ComServer"/>.</para>
+/// <para>Typical usage is to call from an <see langword="await"/> <see langword="using"/> block, using <see cref="WaitForFirstObjectAsync"/> to not close until it is safe to do so.</para>
+/// <code language="cs">
+/// <![CDATA[
+/// await using (WinRtServer server = new WinRtServer())
+/// {
+///     server.RegisterClass<RemoteThing>();
+///     server.Start();
+///     await server.WaitForFirstObjectAsync();
+/// }
+/// ]]>
+/// </code>
+/// </remarks>
 /// <see cref="IAsyncDisposable"/>
 /// <threadsafety static="true" instance="false"/>
 [SupportedOSPlatform("windows8.0")]
 public sealed class WinRtServer : IAsyncDisposable
 {
+    /// <summary>
+    /// Mapping of Activatable Class IDs to activation factories and their <see cref="ComWrappers"/> implementation.
+    /// </summary>
     private readonly Dictionary<string, (BaseActivationFactory Factory, ComWrappers Wrapper)> factories = [];
 
     private readonly unsafe DllGetActivationFactory activationFactoryCallbackWrapper;
@@ -217,6 +234,7 @@ public bool IsDisposed
     /// <summary>
     /// Starts the server.
     /// </summary>
+    /// <remarks>Calling <see cref="Start"/> is non-blocking.</remarks>
     public unsafe void Start()
     {
         if (IsDisposed)