diff --git a/src/Application/Common/Interfaces/IDateTime.cs b/src/Application/Common/Interfaces/IDateTime.cs
index 440aa84f..ad72b706 100644
--- a/src/Application/Common/Interfaces/IDateTime.cs
+++ b/src/Application/Common/Interfaces/IDateTime.cs
@@ -2,6 +2,6 @@
 
 public interface IDateTime
 {
-    // TODO: Talk to Gordon about this - System Clock
+    // TODO: Talk to Gordon about this - System Clock (https://github.com/SSWConsulting/SSW.CleanArchitecture/issues/77)
     public DateTimeOffset Now => DateTimeOffset.UtcNow;
 }
\ No newline at end of file
diff --git a/src/Domain/Common/AuditableEntity.cs b/src/Domain/Common/AuditableEntity.cs
index 7b2344b8..66b80fe3 100644
--- a/src/Domain/Common/AuditableEntity.cs
+++ b/src/Domain/Common/AuditableEntity.cs
@@ -3,7 +3,7 @@
 public abstract class AuditableEntity
 {
     public DateTimeOffset CreatedAt { get; set; }
-    public string? CreatedBy { get; set; } // TODO: String as userId?
+    public string? CreatedBy { get; set; } // TODO: String as userId? (https://github.com/SSWConsulting/SSW.CleanArchitecture/issues/76)
     public DateTimeOffset? UpdatedAt { get; set; }
-    public string? UpdatedBy { get; set; } // TODO: String as userId?
+    public string? UpdatedBy { get; set; } // TODO: String as userId? (https://github.com/SSWConsulting/SSW.CleanArchitecture/issues/76)
 }
\ No newline at end of file
diff --git a/src/Infrastructure/Persistence/Configuration/TodoItemConfiguration.cs b/src/Infrastructure/Persistence/Configuration/TodoItemConfiguration.cs
index 27a7cd7d..5b552d91 100644
--- a/src/Infrastructure/Persistence/Configuration/TodoItemConfiguration.cs
+++ b/src/Infrastructure/Persistence/Configuration/TodoItemConfiguration.cs
@@ -1,13 +1,12 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using SSW.CleanArchitecture.Domain.Entities;
 
 namespace SSW.CleanArchitecture.Infrastructure.Persistence.Configuration;
 
 public class TodoItemConfiguration : IEntityTypeConfiguration<TodoItem>
 {
-    // TODO: Rip out the common pieces that are from BaseEntity
+    // TODO: Rip out the common pieces that are from BaseEntity (https://github.com/SSWConsulting/SSW.CleanArchitecture/issues/78)
     // virtual method, override 
     // Good marker to enforce that all entities have configuration defined via arch tests
     public void Configure(EntityTypeBuilder<TodoItem> builder)
diff --git a/src/WebApi/Features/TodoItemEndpoints.cs b/src/WebApi/Features/TodoItemEndpoints.cs
index 0fa0b50d..1ae4f150 100644
--- a/src/WebApi/Features/TodoItemEndpoints.cs
+++ b/src/WebApi/Features/TodoItemEndpoints.cs
@@ -22,6 +22,7 @@ public static void MapTodoItemEndpoints(this WebApplication app)
 
         // TODO: Investigate examples for swagger docs. i.e. better docs than:
         // myWeirdField: "string" vs myWeirdField: "this-silly-string"
+        // (https://github.com/SSWConsulting/SSW.CleanArchitecture/issues/79)
 
         group
             .MapPost("/", (ISender sender, CreateTodoItemCommand command, CancellationToken ct) => sender.Send(command, ct))
diff --git a/src/WebApi/Filters/ExceptionFilter.cs b/src/WebApi/Filters/ExceptionFilter.cs
index ff16ee04..f6bc4869 100644
--- a/src/WebApi/Filters/ExceptionFilter.cs
+++ b/src/WebApi/Filters/ExceptionFilter.cs
@@ -27,14 +27,12 @@ await context
 
     private static IResult HandleException(this HttpContext context, Exception exception)
     {
-        // TODO: Null exception possibly?
-
         var type = exception.GetType();
 
         if (ExceptionHandlers.ContainsKey(type))
             return ExceptionHandlers[type].Invoke(context, exception);
 
-        // TODO: Testing around unhandled exceptions
+        // TODO: Testing around unhandled exceptions (https://github.com/SSWConsulting/SSW.CleanArchitecture/issues/80)
         return Results.Problem(statusCode: StatusCodes.Status500InternalServerError,
             type: "https://tools.ietf.org/html/rfc7231#section-6.6.1");
     }