diff --git a/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx b/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx
index bfb2141..f357986 100644
--- a/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx
+++ b/source/ch-communities-and-collaboration/sec-cloning-your-origin.ptx
@@ -84,20 +84,20 @@
           <var width="55" />
         </p>
       </statement>
-      <setup> <var> <condition string="^https://github.com/(?!(FarmData2|DickinsonCollege)).+/.+.git$">
+      <setup> <var> <condition string="^https://github\.com/(?!(FarmData2|DickinsonCollege)).+/.+\.git$">
       <feedback>
         <p>
           Thank you.
         </p>
       </feedback>
-      </condition> <condition string="^https://github.com/DickinsonCollege/.+.git">
+      </condition> <condition string="^https://github\.com/DickinsonCollege/.+\.git">
 
       <feedback>
         <p>
           It looks like you might be trying to use the upstream repository instead of your origin.
         </p>
       </feedback>
-      </condition> <condition string="^https://github.com/FarmData2/.+.git">
+      </condition> <condition string="^https://github\.com/FarmData2/.+\.git">
 
       <feedback>
         <p>
@@ -152,34 +152,31 @@
       <var width="65" />
     </p>
   </statement>
-  <setup> <var> <condition string="^https://github.com/(?!(FarmData2|DickinsonCollege)).+/.+.git$">
-  <feedback>
-    <p>
-      Thank you.
-    </p>
-  </feedback>
-  </condition> <condition string="^https://github.com/DickinsonCollege/.+.git">
-
-  <feedback>
-    <p>
-      It looks like you might be trying to use the upstream repository instead of your origin.
-    </p>
-  </feedback>
-  </condition> <condition string="^https://github.com/FarmData2/.+.git">
-
-  <feedback>
-    <p>
-      It looks like you might be trying to use the upstream repository instead of your origin.
-    </p>
-  </feedback>
-  </condition> <condition string=".*">
-
-  <feedback>
-    <p>
-      Be sure to replace <c>&lt;URL&gt;</c> with the clone URL you found in <xref ref="ex-clone-url" />. The clone URL should have the format <c>https://github.com/yourGitHubUsername/theRepoName.git</c>.  
-    </p>
-  </feedback>
-  </condition> </var> </setup>
+  <setup> 
+    <var> 
+      <condition string="^git clone https://github\.com/(?!(FarmData2|DickinsonCollege)).+/.+\.git$">
+        <feedback>
+          <p>
+            Thank you.
+          </p>
+        </feedback>
+      </condition> 
+      <condition string="^git clone https://github\.com/(DickinsonCollege|FarmData2)/.+\.git">
+        <feedback>
+          <p>
+            It looks like you might be trying to clone the upstream repository instead of your origin.
+          </p>
+        </feedback>
+      </condition>
+      <condition string=".*">
+        <feedback>
+          <p>
+            Be sure to replace the URL with the clone URL you found in <xref ref="ex-clone-url" />. The clone URL should have the format <c>https://github.com/yourGitHubUsername/theRepoName.git</c>.  
+          </p>
+        </feedback>
+      </condition> 
+    </var> 
+  </setup>
 </exercise>
 <exercise xml:id="ex-clone-origin-a" label="ex-clone-origin-a">
   <p>
diff --git a/source/ch-communities-and-collaboration/sec-extra-practice.ptx b/source/ch-communities-and-collaboration/sec-extra-practice.ptx
index c7d620d..2f5d522 100644
--- a/source/ch-communities-and-collaboration/sec-extra-practice.ptx
+++ b/source/ch-communities-and-collaboration/sec-extra-practice.ptx
@@ -87,7 +87,7 @@
       </statement>
       <setup>
         <var>
-          <condition string="^https://github.com/((?!(openmrs/openmrs-distro-referenceapplication|apache/fineract|sahana/eden|oppia/oppia)).)*$">
+          <condition string="^https://github\.com/(?!(openmrs/openmrs-distro-referenceapplication|apache/fineract|sahana/eden|oppia/oppia)).*$">
             <feedback>
               <p>
                 Thank you.
@@ -105,7 +105,7 @@
       </setup>
       <hint>
         <p>
-          Make sure you are giving the URL for your fork, not the project's URL. Review <xref ref="topic-forking-the-upstream" /> for information on how to fork a repository on GitHub.
+          Make sure you are giving the URL for your fork, not the project's upstream URL. Review <xref ref="topic-forking-the-upstream" /> for information on how to fork a repository on GitHub.
         </p>
       </hint>
     </exercise>
diff --git a/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx b/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx
index 163f862..e7bd846 100644
--- a/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx
+++ b/source/ch-communities-and-collaboration/sec-forking-the-upstream.ptx
@@ -51,28 +51,28 @@
       
       <setup>
         <var>
-          <condition string="^https://github.com/((?!(yourClass|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2))).*$">
+          <condition string="^https://github\.com/(?!(yourClass|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2)).*$">
             <feedback>
               <p>
                 Thank you.
               </p>
             </feedback>
           </condition>
-          <condition string="^https://github.com/DickinsonCollege/FarmData2">
+          <condition string="^https://github\.com/DickinsonCollege/FarmData2">
             <feedback>
               <p>
                 Looks like you might be trying to use the real FarmData2 upstream. Be sure to use the URL that your instructor has given you.
               </p>
             </feedback>
           </condition>
-          <condition string="^https://github.com/FarmData2/FarmData2">
+          <condition string="^https://github\.com/FarmData2/FarmData2">
             <feedback>
               <p>
                 Looks like you might be trying to use the real FarmData2 upstream. Be sure to use the URL that your instructor has given you.
               </p>
             </feedback>
           </condition>
-          <condition string="^https://github.com/yourClass/theRepoName">
+          <condition string="^https://github\.com/yourClass/theRepoName">
             <feedback>
               <p>
                 Looks like you might be trying to use the example above. That was just for illustration. Be sure to use the URL that your instructor has given you.
@@ -156,28 +156,28 @@
 
       <setup>
         <var>
-          <condition string="^https://github.com/((?!(yourGitHub|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2))).*$">
+          <condition string="^https://github\.com/(?!(yourGitHub|theRepoName|FarmData2/FarmData2|DickinsonCollege/FarmData2)).*$">
             <feedback>
               <p>
                 Thank you.
               </p>
             </feedback>
           </condition>
-          <condition string="^https://github.com/DickinsonCollege/FarmData2">
+          <condition string="^https://github\.com/DickinsonCollege/FarmData2">
             <feedback>
               <p>
                 Looks like you might be giving the URL of the real FarmData2 upstream. Be sure to give the URL of the fork you created in your GitHub space.
               </p>
             </feedback>
           </condition>
-          <condition string="^https://github.com/FarmData2/FarmData2">
+          <condition string="^https://github\.com/FarmData2/FarmData2">
             <feedback>
               <p>
                 Looks like you might be trying to use the real FarmData2 upstream. Be sure to give the URL of the fork you created in your GitHub space.
               </p>
             </feedback>
           </condition>
-          <condition string="^https://github.com/yourGitHub/theRepoName$">
+          <condition string="^https://github\.com/yourGitHub/theRepoName">
             <feedback>
               <p>
                 Looks like you might be trying to use the example above. That was just for illustration. Be sure to use the URL that your instructor has given you.
diff --git a/source/ch-communities-and-collaboration/sec-github-set-up.ptx b/source/ch-communities-and-collaboration/sec-github-set-up.ptx
index e01f4ac..56c19ff 100644
--- a/source/ch-communities-and-collaboration/sec-github-set-up.ptx
+++ b/source/ch-communities-and-collaboration/sec-github-set-up.ptx
@@ -38,13 +38,21 @@
           <var width="45" />
         </p>
       </statement>
-      <setup> <var> <condition string="^https://github.com/.+">
+      <setup> <var> <condition string="^https://github\.com/(?!(yourUsername)).+$">
       <feedback>
         <p>
           Thank you.
         </p>
       </feedback>
-      </condition> <condition string=".*">
+      </condition>
+      <condition string="https://github\.com/yourUsername">
+      <feedback>
+        <p>
+          Looks like you are using the example given.  Be sure to give the URL of your actual GitHub profile.
+        </p>
+      </feedback>
+      </condition>  
+      <condition string=".*">
 
       <feedback>
         <p>
diff --git a/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx b/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx
index f2a7dea..5a2629b 100644
--- a/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx
+++ b/source/ch-communities-and-collaboration/sec-the-issue-tracker.ptx
@@ -472,13 +472,21 @@
           <var width="60" />
         </p>
       </statement>
-      <setup> <var> <condition string="^https://github.com/.+/issues/[0-9]+$">
+      <setup> <var> <condition string="^https://github\.com/(?!(my-class|FarmData2/FarmData2|DickinsonCollege/FarmData2)).+/issues/[0-9]+$">
       <feedback>
         <p>
           Thank you.
         </p>
       </feedback>
-      </condition> <condition string=".*">
+      </condition> 
+      <condition string="https://github\.com/my-class/GitKit-FarmData2/issues/2">
+        <feedback>
+          <p>
+            Looks like you are trying to use the example above. Be sure to use the URL for your actual issue.
+          </p>
+        </feedback>
+      </condition>
+      <condition string=".*">
 
       <feedback>
         <p>
diff --git a/source/ch-merge-conflicts/sec-extra-practice.ptx b/source/ch-merge-conflicts/sec-extra-practice.ptx
index 115d485..fdd4119 100644
--- a/source/ch-merge-conflicts/sec-extra-practice.ptx
+++ b/source/ch-merge-conflicts/sec-extra-practice.ptx
@@ -355,7 +355,7 @@
       </statement>
       <setup> 
         <var> 
-          <condition string="^https://github\.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2)).*/pull/[0-9]+$">
+          <condition string="^https://github\.com/(?!(FarmData2|DickinsonCollege/FarmData2)).+/pull/[0-9]+$">
             <feedback>
               <p>
                 Thank you.
@@ -365,7 +365,7 @@
           <condition string=".*">
             <feedback>
               <p>
-                Be sure that your URL is from your pull request to the upstream repository.  It should have the format <c>https://github.com/upstreamLocation/upstreamReop/pulls/xx</c>, where <c>xx</c> is a number.
+                Be sure that your URL is from your pull request to the upstream repository for your course.  It should have the format <c>https://github.com/yourCourse/repoName/pulls/xx</c>, where <c>xx</c> is a number.
               </p>
             </feedback>
           </condition>
diff --git a/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx b/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx
index aaeb5ca..d361908 100644
--- a/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx
+++ b/source/ch-merge-conflicts/sec-merging-the-main-branch-into-a-feature-branch.ptx
@@ -235,13 +235,6 @@
                 </p>
               </feedback>
             </condition>
-            <condition string=".*">
-              <feedback>
-                <p>
-                  Review the format of the <c>git merge</c> command above.
-                </p>
-              </feedback>
-            </condition>
             <condition string=".*">
               <feedback>
                 <p>
diff --git a/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx b/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx
index b33acdc..54a063d 100644
--- a/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx
+++ b/source/ch-merge-conflicts/sec-updating-your-pull-request.ptx
@@ -49,7 +49,7 @@
               </p>
             </feedback>
           </condition>
-          <condition string="^git .*">
+          <condition string=".*">
             <feedback>
               <p>
                 Review the <c>git push</c> command in <xref ref="topic-pushing-a-branch-to-your-origin" />. 
diff --git a/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx b/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx
index 464b3fd..764bc0d 100644
--- a/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx
+++ b/source/ch-upstreaming-changes/sec-committing-to-your-local-repository.ptx
@@ -112,12 +112,12 @@
       </p>
 
       <p>
-        <var width="55" />
+        <var width="75" />
       </p>
     </statement>
     <setup> 
     <var> 
-    <condition string='^git commit -m ["].+["]$'>
+    <condition string='^git commit -m ["].{20,72}["]$'>
     <feedback>
       <p>
         Thank you.
@@ -125,6 +125,20 @@
       </p>
     </feedback>
     </condition>
+    <condition string='^git commit -m ["].{0,20}["]$'>
+      <feedback>
+        <p>
+          Try using a longer commit message to be more descriptive.  
+        </p>
+      </feedback>
+    </condition>
+        <condition string='^git commit -m ["].{73,}["]$'>
+      <feedback>
+        <p>
+          Try using a more concise commit message.  
+        </p>
+      </feedback>
+    </condition>
     <condition string=".*">
 
     <feedback>
diff --git a/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx b/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx
index 96595c4..a4e48dc 100644
--- a/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx
+++ b/source/ch-upstreaming-changes/sec-creating-a-pull-request.ptx
@@ -235,14 +235,17 @@
         <var width="55" />
       </p>
     </statement>
-    <setup> <var> <condition string='^https://github.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2))(.+/.+)/pull/[0-9]+$'>
-    <feedback></feedback>
+    <setup> <var> <condition string='^https://github\.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2))(.+/.+)/pull/[1-9][0-9]*$'>
+    <feedback>
+      <p>
+        Thank you.
+      </p>
+    </feedback>
     </condition> <condition string=".*">
 
     <feedback>
       <p>
-        The upstream repository is the repository you forked from.
-        Double check that you aren't in your origin repository.
+        Double check the URL of your pull request to ensure that it is in the upstream for your course and is correct.
       </p>
     </feedback>
     </condition> </var> </setup>
diff --git a/source/ch-upstreaming-changes/sec-editing-local-files.ptx b/source/ch-upstreaming-changes/sec-editing-local-files.ptx
index a163621..0fe5a8d 100644
--- a/source/ch-upstreaming-changes/sec-editing-local-files.ptx
+++ b/source/ch-upstreaming-changes/sec-editing-local-files.ptx
@@ -27,7 +27,7 @@
         <var width="55" />
       </p>
     </statement>
-    <setup> <var> <condition string="^https://github.com/.+/issues/\b([1-9]|[12][0-9]|3[0-5])\b$">
+    <setup> <var> <condition string="^https://github\.com/(?!(FarmData2/FarmData2|DickinsonCollege/FarmData2)).+/issues/([4-9]|[12][0-9]|3[0-5])$">
     <feedback>
       <p>
         Thank you.
@@ -37,7 +37,7 @@
 
     <feedback>
       <p>
-        Make sure you have pasted the complete URL starting with https and ending with the issue number.
+        Make sure you have pasted the complete URL starting with https and ending with the issue number that you have been assigned.
       </p>
     </feedback>
     </condition> </var> </setup>
diff --git a/source/ch-upstreaming-changes/sec-staging-changes.ptx b/source/ch-upstreaming-changes/sec-staging-changes.ptx
index 3480d14..7da3d71 100644
--- a/source/ch-upstreaming-changes/sec-staging-changes.ptx
+++ b/source/ch-upstreaming-changes/sec-staging-changes.ptx
@@ -50,20 +50,27 @@
         </statement>
           <setup>
         <var>
-          <condition string="^git stage(\s+)(CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)$">
+          <condition string="^git stage (CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)$">
             <feedback>
               <p>
                 Thank you.
               </p>
             </feedback>
           </condition>
-          <condition string="^git stage(\s+)!(CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)$">
+          <condition string="^git stage (?!(CONTRIBUTING.md|INSTALL.md|ONBOARDING.md|README.md)).*">
             <feedback>
               <p>
                 Are you sure that is the file that the issue asked you to edit?
               </p>
             </feedback>
           </condition>
+          <condition string=".*">
+            <feedback>
+              <p>
+                Check the format of your <c>git stage</c> command.
+              </p>
+            </feedback>
+          </condition>
         </var>
       </setup>
       <hint>