diff --git a/vimrc b/vimrc
index 9788e13..2a3512c 100644
--- a/vimrc
+++ b/vimrc
@@ -127,16 +127,34 @@ let g:CommandTMatchWindowReverse=1
 
 "xterm key combos
 map OD <M-Left>
+map! OD <M-Left>
 map OC <M-Right>
-noremap  <C-Left>
-noremap  <C-Right>
-"OSX control key
-noremap  <Home>
-noremap  <End>
+map! OC <M-Right>
+map  <C-Left>
+map!  <C-Left>
+map  <C-Right>
+map!  <C-Right>
+"iTerm2 control+arrows
+map  <Home>
+map!  <Home>
+map  <End>
+map!  <End>
+"Terminal.app control+arrows
+map  <Home>
+map!  <Home>
+map  <End>
+map!  <End>
+"Terminal.app option+arrows
+map b <M-Left>
+map! b <M-Left>
+map f <M-Right>
+map! f <M-Right>
 
 " make meta move on words like control
-noremap <M-Left> <C-Left>
-noremap <M-Right> <C-Right>
+map <M-Left> <C-Left>
+map! <M-Left> <C-Left>
+map <M-Right> <C-Right>
+map! <M-Right> <C-Right>
 
 " highlight background for >80
 "highlight OverLength ctermbg=red ctermfg=white guibg=#592929