diff --git a/Build/Cake/ci.cake b/Build/Cake/ci.cake
index f39f1de7e47..c07bbd602b2 100644
--- a/Build/Cake/ci.cake
+++ b/Build/Cake/ci.cake
@@ -1,6 +1,10 @@
+// This is the task CI will use to build release packages
+
 Task("BuildAll")
     .IsDependentOn("CleanArtifacts")
     .IsDependentOn("UpdateDnnManifests")
+    .IsDependentOn("GenerateChecksum")
+    .IsDependentOn("SetPackageVersions")
 	.IsDependentOn("CreateInstall")
 	.IsDependentOn("CreateUpgrade")
     .IsDependentOn("CreateDeploy")
diff --git a/Build/Cake/compiling.cake b/Build/Cake/compiling.cake
index 600b05605d5..2273a3c168b 100644
--- a/Build/Cake/compiling.cake
+++ b/Build/Cake/compiling.cake
@@ -1,4 +1,5 @@
-// Main solution
+// This tasks kicks off MS Build (just as in Visual Studio)
+
 var dnnSolutionPath = "./DNN_Platform.sln";
 
 Task("Build")
diff --git a/Build/Cake/database.cake b/Build/Cake/database.cake
index b888eb83d06..aa85e1ea9c0 100644
--- a/Build/Cake/database.cake
+++ b/Build/Cake/database.cake
@@ -1,3 +1,5 @@
+// Database tasks for your local DNN development site
+
 Task("ResetDatabase")
   .Does(() => 
     {
diff --git a/Build/Cake/devsite.cake b/Build/Cake/devsite.cake
index 9e20dac79f7..c98dbd7a4a7 100644
--- a/Build/Cake/devsite.cake
+++ b/Build/Cake/devsite.cake
@@ -1,3 +1,6 @@
+// Tasks to help you create and maintain a local DNN development site.
+// Note these tasks depend on the correct settings in your settings file.
+
 Task("ResetDevSite")
     .IsDependentOn("ResetDatabase")
     .IsDependentOn("PreparePackaging")
diff --git a/Build/Cake/packaging.cake b/Build/Cake/packaging.cake
index 4e15b843ea5..b4008172a15 100644
--- a/Build/Cake/packaging.cake
+++ b/Build/Cake/packaging.cake
@@ -1,3 +1,5 @@
+// The tasks create the various DNN release packages (Install, Upgrade, Deploy and Symbols)
+
 using Dnn.CakeUtils;
 
 public class PackagingPatterns {
diff --git a/Build/Cake/settings.cake b/Build/Cake/settings.cake
index 141de5426fb..2565d5c6409 100644
--- a/Build/Cake/settings.cake
+++ b/Build/Cake/settings.cake
@@ -1,3 +1,6 @@
+// This file loads or creates the local settings file you can use to influence the build process
+// and/or maintain a local DNN development site
+
 public class LocalSettings {
     public string WebsitePath {get; set;} = "";
     public string WebsiteUrl {get; set;} = "";
diff --git a/Build/Cake/version.cake b/Build/Cake/version.cake
index 18b498db0fb..57ebdafc7c8 100644
--- a/Build/Cake/version.cake
+++ b/Build/Cake/version.cake
@@ -1,4 +1,5 @@
-// These tasks are meant for our CI build process. They set the versions of the assemblies and manifests to the version found on Github.
+// These tasks will set the right version for manifests and assemblies. Note you can
+// control this by using custom settings
 
 GitVersion version;
 var buildId = EnvironmentVariable("BUILD_BUILDID") ?? "0";
@@ -53,7 +54,6 @@ Task("SetVersion")
 
 Task("UpdateDnnManifests")
   .IsDependentOn("SetVersion")
-  .IsDependentOn("GenerateChecksum")
   .IsDependentOn("SetPackageVersions")
   .DoesForEach(GetFilesByPatterns(".", new string[] {"**/*.dnn"}, unversionedManifests), (file) => 
   { 
diff --git a/build.cake b/build.cake
index 8d736239852..3757d16d682 100644
--- a/build.cake
+++ b/build.cake
@@ -1,3 +1,5 @@
+// Main Cake Build entry points. Note most Cake scripts are located under Build/Cake.
+
 #addin nuget:?package=Cake.XdtTransform&version=0.18.1&loaddependencies=true
 #addin nuget:?package=Cake.FileHelpers&version=3.2.0
 #addin nuget:?package=Cake.Powershell&version=0.4.8
@@ -98,7 +100,12 @@ Task("CleanArtifacts")
 //////////////////////////////////////////////////////////////////////
 
 Task("Default")
-    .IsDependentOn("BuildAll");
+    .IsDependentOn("CleanArtifacts")
+    .IsDependentOn("UpdateDnnManifests")
+	.IsDependentOn("CreateInstall")
+	.IsDependentOn("CreateUpgrade")
+    .IsDependentOn("CreateDeploy")
+    .IsDependentOn("CreateSymbols");
 
 //////////////////////////////////////////////////////////////////////
 // EXECUTION