diff --git a/Tools/dump_commits_since.ps1 b/Tools/dump_commits_since.ps1
index 8048cc1a15..6b8b3b136b 100755
--- a/Tools/dump_commits_since.ps1
+++ b/Tools/dump_commits_since.ps1
@@ -6,16 +6,22 @@ param(
     [Parameter(Mandatory=$true)]
     [DateTime]$since,
 
+    [Nullable[DateTime]]$until,
+
     [Parameter(Mandatory=$true)]
     [string]$repo);
 
 $r = @()
 
 $qParams = @{
-    "since" = $since.ToString("o")
+    "since" = $since.ToString("o");
     "per_page" = 100
 }
 
+if ($until -ne $null) {
+    $qParams["until"] = $until.ToString("o")
+}
+
 $url = "https://api.github.com/repos/{0}/commits" -f $repo
 
 while ($null -ne $url)
diff --git a/Tools/dump_contributors_since.ps1 b/Tools/dump_contributors_since.ps1
index 291a34600c..d591845540 100644
--- a/Tools/dump_contributors_since.ps1
+++ b/Tools/dump_contributors_since.ps1
@@ -4,13 +4,28 @@
 
 param(
     [Parameter(Mandatory=$true)]
-    [DateTime]$since);
+    [DateTime]$since,
 
-$engine = & "$PSScriptRoot\dump_commits_since.ps1" -repo space-wizards/RobustToolbox -since $since
-$content = & "$PSScriptRoot\dump_commits_since.ps1" -repo space-wizards/space-station-14 -since $since
+    [Nullable[DateTime]]$until);
 
-($content + $engine) `
+$replacements = @{
+    "moonheart08" = "moony"
+}
+
+$ignore = @{
+    "PJBot" = $true
+}
+
+$engine = & "$PSScriptRoot\dump_commits_since.ps1" -repo space-wizards/RobustToolbox -since $since -until $until
+$content = & "$PSScriptRoot\dump_commits_since.ps1" -repo space-wizards/space-station-14 -since $since -until $until
+
+$contribs = ($content + $engine) `
     | Select-Object -ExpandProperty author `
     | Select-Object -ExpandProperty login -Unique `
+    | Where-Object { -not $ignore[$_] }
+    | ForEach-Object { $replacements[$_] ?? $_ } 
     | Sort-Object `
     | Join-String -Separator ", "
+
+Write-Host $contribs
+Write-Host "Total commit count is $($engine.Length + $content.Length)"
\ No newline at end of file