diff --git a/__tests__/remote.spec.js b/__tests__/remote.spec.js
index 4e727483..5bad8e5e 100644
--- a/__tests__/remote.spec.js
+++ b/__tests__/remote.spec.js
@@ -79,7 +79,7 @@ describe('Git Remotes', function() {
     );
   });
 
-  it('checks all branhces for fetching', function() {
+  it('checks all branches for fetching', function() {
     expectTreeAsync(
       'git branch bugFix; git clone; git fakeTeamwork; git fetch',
       '{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"bugFix":{"target":"C1","id":"bugFix","remoteTrackingBranchID":"o/bugFix"},"o/master":{"target":"C2","id":"o/master","remoteTrackingBranchID":null},"o/bugFix":{"target":"C1","id":"o/bugFix","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null},"bugFix":{"target":"C1","id":"bugFix","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}}'
@@ -275,7 +275,7 @@ describe('Git Remotes', function() {
     );
   });
 
-  it('correclty checks upstream when pushing to a remote where commits already exist but branch is not updated DAYAM dawg', function() {
+  it('correctly checks upstream when pushing to a remote where commits already exist but branch is not updated DAYAM dawg', function() {
     expectTreeAsync(
       'git push origin master^:master',
       '{"branches":{"master":{"target":"C9","id":"master","remoteTrackingBranchID":"o/master"},"foo":{"target":"C8","id":"foo","remoteTrackingBranchID":"o/foo"},"o/master":{"target":"C5","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C5","id":"o/foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C1"],"id":"C4"},"C5":{"parents":["C2","C4"],"id":"C5"},"C6":{"parents":["C4"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"},"C8":{"parents":["C5","C7"],"id":"C8"},"C9":{"parents":["C5"],"id":"C9"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C5","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C5","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C4":{"parents":["C1"],"id":"C4"},"C5":{"parents":["C2","C4"],"id":"C5"}},"HEAD":{"target":"master","id":"HEAD"}}}',
@@ -297,7 +297,7 @@ describe('Git Remotes', function() {
     );
   });
 
-	it('correctly resolves existing commits and upates', function() {
+	it('correctly resolves existing commits and updates', function() {
     expectTreeAsync(
       'git clone; git push origin master:foo; git fakeTeamwork foo 2; git fetch origin foo^:blah;go C0; git fetch origin foo^:master',
       '{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C1","id":"o/master","remoteTrackingBranchID":null},"o/foo":{"target":"C1","id":"o/foo","remoteTrackingBranchID":null},"blah":{"target":"C2","id":"blah","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"C0","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":null},"foo":{"target":"C3","id":"foo","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"HEAD":{"target":"foo","id":"HEAD"}}}'
diff --git a/src/js/git/commands.js b/src/js/git/commands.js
index 46e27e8e..6af5a113 100644
--- a/src/js/git/commands.js
+++ b/src/js/git/commands.js
@@ -558,7 +558,7 @@ var commandConfig = {
       );
 
       if (newCommit === undefined) {
-        // its just a fast forwrard
+        // its just a fast forward
         engine.animationFactory.refreshTree(
           engine.animationQueue, engine.gitVisuals
         );
diff --git a/src/js/graph/treeCompare.js b/src/js/graph/treeCompare.js
index 6b6385a6..0cf71286 100644
--- a/src/js/graph/treeCompare.js
+++ b/src/js/graph/treeCompare.js
@@ -251,7 +251,7 @@ TreeCompare.getNumHashes = function(ref) {
       return func(results);
     }
   }
-  throw new Error('coudlnt parse ref ' + ref);
+  throw new Error('couldnt parse ref ' + ref);
 };
 
 TreeCompare.getBaseRef = function(ref) {
diff --git a/src/js/level/disabledMap.js b/src/js/level/disabledMap.js
index a63252e3..6d2f9d25 100644
--- a/src/js/level/disabledMap.js
+++ b/src/js/level/disabledMap.js
@@ -15,7 +15,7 @@ function DisabledMap(options) {
 
 DisabledMap.prototype.getInstantCommands = function() {
   // this produces an array of regex / function pairs that can be
-  // piped into a parse waterfall to disable certain git commmands
+  // piped into a parse waterfall to disable certain git commands
   // :D
   var instants = [];
   var onMatch = function() {
diff --git a/src/js/level/index.js b/src/js/level/index.js
index 08503851..3466ce66 100644
--- a/src/js/level/index.js
+++ b/src/js/level/index.js
@@ -343,7 +343,7 @@ var Level = Sandbox.extend({
   initParseWaterfall: function(options) {
     Level.__super__.initParseWaterfall.apply(this, [options]);
 
-    // add our specific functionaity
+    // add our specific functionality
     this.parseWaterfall.addFirst(
       'parseWaterfall',
       parse
diff --git a/src/js/sandbox/index.js b/src/js/sandbox/index.js
index e4c946ec..f6fd0c81 100644
--- a/src/js/sandbox/index.js
+++ b/src/js/sandbox/index.js
@@ -72,7 +72,7 @@ var Sandbox = Backbone.View.extend({
   },
 
   takeControl: function() {
-    // we will be handling commands that are submitted, mainly to add the sanadbox
+    // we will be handling commands that are submitted, mainly to add the sandbox
     // functionality (which is included by default in ParseWaterfall())
     Main.getEventBaton().stealBaton('commandSubmitted', this.commandSubmitted, this);
     // we obviously take care of sandbox commands
@@ -232,7 +232,7 @@ var Sandbox = Backbone.View.extend({
   },
 
   processSandboxCommand: function(command, deferred) {
-    // I'm tempted to do camcel case conversion, but there are
+    // I'm tempted to do cancel case conversion, but there are
     // some exceptions to the rule
     var commandMap = {
       'reset solved': this.resetSolved,
diff --git a/src/js/util/errors.js b/src/js/util/errors.js
index 041f7b30..4084e7bf 100644
--- a/src/js/util/errors.js
+++ b/src/js/util/errors.js
@@ -11,7 +11,7 @@ var MyError = Backbone.Model.extend({
   getMsg: function() {
     if (!this.get('msg')) {
       debugger;
-      console.warn('mye rror without message');
+      console.warn('my error without message');
     }
     return this.get('msg');
   }
diff --git a/src/js/visuals/visTag.js b/src/js/visuals/visTag.js
index fc1bd024..bf746a4a 100644
--- a/src/js/visuals/visTag.js
+++ b/src/js/visuals/visTag.js
@@ -89,7 +89,7 @@ var VisTag = VisBase.extend({
 
   getTagStackIndex: function() {
     if (this.get('isHead')) {
-      // head is never stacked with other Tages
+      // head is never stacked with other Tags
       return 0;
     }
 
diff --git a/src/js/visuals/visualization.js b/src/js/visuals/visualization.js
index e0f708e2..0adf4930 100644
--- a/src/js/visuals/visualization.js
+++ b/src/js/visuals/visualization.js
@@ -34,7 +34,7 @@ var Visualization = Backbone.View.extend({
     this.paper = paper;
 
     var Main = require('../app');
-    // if we dont want to receive keyoard input (directly),
+    // if we dont want to receive keyboard input (directly),
     // make a new event baton so git engine steals something that no one
     // is broadcasting to
     this.eventBaton = (options.noKeyboardInput) ?
diff --git a/todo.txt b/todo.txt
index 074e83f8..342eebfb 100644
--- a/todo.txt
+++ b/todo.txt
@@ -43,7 +43,7 @@ Done things:
     (doesnt update origin/master) and then merges them into banana.
 [x] and then "git pull origin banana:origin/banana"  works because it goes into
     the remote branch and then merges the fetch HEAD with current location
-[x] oh boy heres anothere data point. git fetch banana:banana will actually
+[x] oh boy heres another data point. git fetch banana:banana will actually
     fast-forward banana to what remote has, but not update o/banana. weirdly it
     doesnt let you do this if you are checked out on banana
 [x] furthermore, if banana has commits and its not a FF, it will reject the command. wth??
@@ -181,7 +181,7 @@ Done things:
 [x] markdown parsing yay!!
 [x] check animation for command entry fading nicely wtf
 [x] no more CSS ids in views
-[x] promise-based confirm cnacel
+[x] promise-based confirm cancel
 [x] rebase buttons view & styling
 [x] rebase entries styling
 [x] view for anything above the fold (modal view)