diff --git a/.bash_profile b/.bash_profile
index d69d7e0..bb60817 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -26,4 +26,4 @@ export LANG="en_US"
 complete -W "NSGlobalDomain" defaults
 
 # Add tab completion for `killall SystemUIServer`
-complete -W "SystemUIServer" killall
\ No newline at end of file
+complete -o "nospace" -W "SystemUIServer" killall
\ No newline at end of file
diff --git a/.osx b/.osx
index d13b53b..def7893 100755
--- a/.osx
+++ b/.osx
@@ -55,12 +55,16 @@ defaults write NSGlobalDomain KeyRepeat -int 0
 # Disable auto-correct
 defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
 
-# Enable tap to click (Trackpad)
+# Enable tap to click (Trackpad) for this user and for the login screen
 defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true
+defaults -currentHost write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
+defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
 
 # Map bottom right Trackpad corner to right-click
 defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadCornerSecondaryClick -int 2
 defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadRightClick -bool true
+defaults -currentHost write NSGlobalDomain com.apple.trackpad.trackpadCornerClickBehavior -int 1
+defaults -currentHost write NSGlobalDomain com.apple.trackpad.enableSecondaryClick -bool true
 
 # Require password immediately after sleep or screen saver begins
 defaults write com.apple.screensaver askForPassword -int 1
@@ -208,4 +212,5 @@ file=/Applications/Dropbox.app/Contents/Resources/check.icns
 unset file
 
 # Kill affected applications
-for app in Safari Finder Dock Mail SystemUIServer; do killall "$app" > /dev/null 2>&1; done
\ No newline at end of file
+for app in Safari Finder Dock Mail SystemUIServer; do killall "$app" > /dev/null 2>&1; done
+echo "Done. Note that some of these changes require a logout/restart to take effect."
\ No newline at end of file