diff --git a/vimrc b/vimrc
index ab747a7..f9aeee6 100644
--- a/vimrc
+++ b/vimrc
@@ -182,8 +182,14 @@ iab KREN_EMERG KERN_EMERG
 map <C-K>e :read
 " List current buffers
 map <C-L> :buffers<CR>
-" Reformat selected text
-" map <C-W> gq
+" Reformat selected text; normal mode only so we don't accidentally wrap a
+" paragraph by typing that string!
+nmap <leader>wp 0v$gq
+
+nmap <leader>cw y/ <CR>
+
+" Save
+map <C-S> :w<CR>
 
 " Needed because PuTTY doesn't seem to send the usual ctrl-up/down sequences
 map <ESC>[A     <C-Up>