diff --git a/src/AppDelegate.swift b/src/AppDelegate.swift
index d789501..82dcfff 100644
--- a/src/AppDelegate.swift
+++ b/src/AppDelegate.swift
@@ -18,6 +18,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
 
         window.delegate = self
 
+        // TODO: Move down.
         // NOTE: Here we check wether the program was launched by the
         // system (e.g. launch-at-login). If it was not, then display the
         // window.
diff --git a/src/Makefile b/src/Makefile
index 9a49a02..8408377 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -86,11 +86,11 @@ $(EXEC).app: $(EXEC)
 	mkdir -p $@/Contents/Resources/ && \
 	cp Info.plist $@/Contents/ && \
 	cp resources/AppIcon.icns $@/Contents/Resources/ && \
-	cp $(EXEC) $@/Contents/MacOS/ && \
-	$(if $(DEBUG), codesign --entitlements Grapp.entitlements \
-		-s ${APPLE_DEVELOPMENT} -f --timestamp -o runtime $(EXEC).app, \
-			codesign -s ${APPLE_DEVELOPER_ID_APPLICATION} -f --timestamp \
-				-o runtime $(EXEC).app)
+	cp $(EXEC) $@/Contents/MacOS/
+	# $(if $(DEBUG), codesign --entitlements Grapp.entitlements \
+	# 	-s ${APPLE_DEVELOPMENT} -f --timestamp -o runtime $(EXEC).app, \
+	# 		codesign -s ${APPLE_DEVELOPER_ID_APPLICATION} -f --timestamp \
+	# 			-o runtime $(EXEC).app)
 
 clean:
 	rm -rf $(EXEC) $(EXEC).app arm64 x86_64
diff --git a/src/PathManager.swift b/src/PathManager.swift
index 536f3fb..8c5ea4b 100644
--- a/src/PathManager.swift
+++ b/src/PathManager.swift
@@ -134,7 +134,6 @@ final class PathManager {
     }
 
     public func updateIndex() {
-        print("updateIndex()")
         for path in paths {
             rebuildIndex(at: path.key)
         }
diff --git a/src/ProgramsTable.swift b/src/ProgramsTable.swift
index 33e8037..eeec391 100644
--- a/src/ProgramsTable.swift
+++ b/src/ProgramsTable.swift
@@ -22,6 +22,7 @@ class ProgramsTableViewCell: NSTableCellView {
 
     public var indexLabel: NSTextField = {
         let field = NSTextField(labelWithString: "-")
+        field.isEditable = false
         field.alignment = .center
 
         // field.drawsBackground = true
@@ -49,6 +50,7 @@ class ProgramsTableViewCell: NSTableCellView {
 
     public var titleField: NSTextField = {
         let field = NSTextField()
+        field.isEditable = false
         field.isBordered = false
         field.drawsBackground = false
         field.lineBreakMode = .byTruncatingTail
@@ -59,6 +61,7 @@ class ProgramsTableViewCell: NSTableCellView {
 
     public var progPathLabel: NSTextField = {
         let field = NSTextField()
+        field.isEditable = false
         field.isBordered = false
         field.drawsBackground = false
         field.lineBreakMode = .byTruncatingTail
diff --git a/src/SearchViewController.swift b/src/SearchViewController.swift
index 29ab3cb..cb38c9c 100644
--- a/src/SearchViewController.swift
+++ b/src/SearchViewController.swift
@@ -61,6 +61,7 @@ class SearchViewController: NSViewController, NSTextFieldDelegate,
         textField.lineBreakMode = .byTruncatingHead
         textField.focusRingType = .none
         textField.placeholderString = "Program Search"
+        textField.isAutomaticTextCompletionEnabled = false
         textField.bezelStyle = .roundedBezel
         textField.font = NSFont
             .systemFont(ofSize: NSFontDescriptor
@@ -346,7 +347,9 @@ class SearchViewController: NSViewController, NSTextFieldDelegate,
 
     private func reloadProgramsTableViewData() {
         if listIndex > 0 {
-            tableViewHeightAnchor?.constant = 210
+            // TODO: Why is this located here, randomly? Make it a global
+            // config variable.
+            tableViewHeightAnchor?.constant = 250
         } else {
             tableViewHeightAnchor?.constant = 0
         }
diff --git a/src/SettingsViewController.swift b/src/SettingsViewController.swift
index 77303c4..6476597 100644
--- a/src/SettingsViewController.swift
+++ b/src/SettingsViewController.swift
@@ -5,16 +5,17 @@ import ServiceManagement
 // TODO: Rework the paths table and selection. Right now, it is very
 // disfunctional and error-prone.
 class SettingsViewController: NSViewController,
-                              NSTextFieldDelegate, KeyDetectorButtonDelegate,
-                              NSTableViewDataSource, NSTableViewDelegate,
-                              PathsTableCellViewDelegate
+    NSTextFieldDelegate, KeyDetectorButtonDelegate, NSTableViewDataSource,
+    NSTableViewDelegate, PathsTableCellViewDelegate
 {
     private var keyboardEvents: EventMonitor?
 
     private var recording = false
 
     // NOTE: This is the default shortcut. If you were to change it, don't
-    //       forget to change other places in this file and delegate, too.
+    // forget to change other places in this file and delegate, too.
+    // TODO: Come up with a way where we don't have to specify these in
+    // multiple locations.
     private var keyCode = Int(kVK_Space)
     private var modifiers = Int(optionKey)
 
@@ -356,7 +357,7 @@ class SettingsViewController: NSViewController,
             let modifiers = event.modifierFlags.rawValue
 
             if modsContains(keys: OSCmd, in: modifiers) &&
-                key == kVK_ANSI_Q || modsContainsNone(in: modifiers)
+                key == kVK_ANSI_Q
             {
                 NSApplication.shared.terminate(self)
             }
@@ -623,7 +624,7 @@ class SettingsViewController: NSViewController,
     func selectionButtonClicked(tag: Int) {
         if dirPicker == nil {
             dirPicker = NSOpenPanel()
-            dirPicker!.message = "Select a directory to search applications in..."
+            dirPicker!.message = "Select a directory with applications..."
             dirPicker!.canChooseDirectories = true
             dirPicker!.canChooseFiles = false
             dirPicker!.allowsMultipleSelection = false
@@ -663,8 +664,7 @@ class SettingsViewController: NSViewController,
     func tableView(_ tableView: NSTableView,
         viewFor tableColumn: NSTableColumn?, row: Int) -> NSView?
     {
-        let rect = NSRect(x: 0, y: 0, width: tableColumn!.width,
-                                      height: 20)
+        let rect = NSRect(x: 0, y: 0, width: tableColumn!.width, height: 20)
         let cell = PathsTableCellView(frame: rect)
         cell.titleField.stringValue = paths[row]
         cell.delegate = self