diff --git a/spec/app/project-spec.coffee b/spec/app/project-spec.coffee
index cc3d3879e..c7b420650 100644
--- a/spec/app/project-spec.coffee
+++ b/spec/app/project-spec.coffee
@@ -188,7 +188,7 @@ describe "Project", ->
         runs ->
           expect(paths).not.toContain('ignored/ignored.txt')
 
-  fdescribe ".scan(options, callback)", ->
+  describe ".scan(options, callback)", ->
     describe "when called with a regex", ->
       it "calls the callback with all regex matches in all files in the project", ->
         matches = []
diff --git a/src/app/project.coffee b/src/app/project.coffee
index 3c10f744a..e2ad125d3 100644
--- a/src/app/project.coffee
+++ b/src/app/project.coffee
@@ -164,9 +164,9 @@ class Project
         state = 'readingPath'
         path = null
       else
-        colonIndex = line.indexOf(':')
+        colonIndex = line.indexOf(': ')
         matchInfo = line.substring(0, colonIndex)
-        lineText = line.substring(colonIndex + 1)
+        lineText = line.substring(colonIndex + 2)
         readMatches(matchInfo, lineText)
 
     readMatches = (matchInfo, lineText) ->
@@ -176,7 +176,7 @@ class Project
 
       for [column, length] in matchPositions
         range = new Range([row, column], [row, column + length])
-        match = lineText.substr(column + 1, length)
+        match = lineText.substr(column, length)
         iterator({path, range, match, lineText})
 
     deferred = $.Deferred()
diff --git a/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee b/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee
index 20df613a3..6cf583596 100644
--- a/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee
+++ b/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee
@@ -22,4 +22,4 @@ class SelectAllMatchesInProject extends Command
       ))
 
     promise.done -> deferred.resolve(operations)
-    deferred.promise()
\ No newline at end of file
+    deferred.promise()
diff --git a/src/packages/command-panel/lib/operation.coffee b/src/packages/command-panel/lib/operation.coffee
index f9b22973c..3dc17b29e 100644
--- a/src/packages/command-panel/lib/operation.coffee
+++ b/src/packages/command-panel/lib/operation.coffee
@@ -23,10 +23,10 @@ class Operation
     @getBufferRange() unless @preserveSelection
 
   preview: ->
-    range = @bufferRange
-    prefix = @lineText[0...range.start.column + 1]
-    match = @lineText[range.start.column + 1...range.end.column + 1]
-    suffix = @lineText[range.end.column + 1..]
+    range = @getBufferRange()
+    prefix = @lineText[0...range.start.column]
+    match = @lineText[range.start.column...range.end.column]
+    suffix = @lineText[range.end.column..]
 
     {prefix, suffix, match, range}
 
diff --git a/src/packages/command-panel/lib/preview-list.coffee b/src/packages/command-panel/lib/preview-list.coffee
index 49cb95835..58cb0f799 100644
--- a/src/packages/command-panel/lib/preview-list.coffee
+++ b/src/packages/command-panel/lib/preview-list.coffee
@@ -56,7 +56,7 @@ class PreviewList extends ScrollView
       pathView.addOperation(operation)
       @lastRenderedOperationIndex++
       break if not renderAll and @prop('scrollHeight') >= startingScrollHeight + @pixelOverdraw and @prop('scrollHeight') > @height() + @pixelOverdraw
- 
+
   pathViewForPath: (path) ->
     pathView = @viewsForPath[path]
     if not pathView