diff --git a/emacs/init.el b/emacs/init.el
index 4dd4163..8277847 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -107,8 +107,11 @@
          ("C-o 1" . delete-other-windows)
          ("C-o t" . tab-bar-new-tab)
          ("C-o ]" . tab-bar-switch-to-next-tab)
+         ("M-)" . tab-bar-switch-to-next-tab)
+         ("M-(" . tab-bar-switch-to-prev-tab)
          ("C-o [" . tab-bar-switch-to-prev-tab)
-         ("C-o T" . tab-bar-close-tab)
+         ("C-o T" . tab-bar-undo-close-tab)
+         ("C-o w" . tab-bar-close-tab)
          ;; TODO C-/ for undo window state change
          ("C-o z" . my/zoom-window)
          ;; TODO other-window scrolling
@@ -132,7 +135,11 @@
 ;; Use right-option as regular option on Mac
 (setq ns-alternate-modifier 'meta)
 (setq ns-right-alternate-modifier 'none)
-(setq ns-right-command-modifier 'meta)
+(setq ns-command-modifier 'meta)
+(setq ns-right-command-modifier 'super)
+
+;; Training wheels for Cmd-S
+(global-set-key (kbd "M-s M-s") 'save-buffer)
 
 ;;; Editing
 ;;;; MWIM