diff --git a/vim/doc/akmap.txt b/vim/doc/akmap.txt
index 6b17693..e58d54f 100644
--- a/vim/doc/akmap.txt
+++ b/vim/doc/akmap.txt
@@ -58,7 +58,15 @@ See |textformat|
 
                                 *akmap-misc*
 7. Misc~
-Empty for now
+
+In command or insertion mode:
+<Shift-Ctrl-Up>   - Move line up
+<Shift-Ctrl-Down> - Move line down
+
+In Visual mode:
+<Shift-Ctrl-Up>   - Move block up
+<Shift-Ctrl-Down> - Move block down
+
 
                                 *akmap-ver*
 8. Version~
@@ -66,4 +74,4 @@ Author: Andrea Mistrali
 Version: $Id$
 Last change: $Date$
 
- vim:tw=78:ts=8:ft=help:norl:
+vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim/templates/skeleton.py b/vim/templates/skeleton.py
index fe2323d..cae82ba 100644
--- a/vim/templates/skeleton.py
+++ b/vim/templates/skeleton.py
@@ -17,8 +17,8 @@ __author__ ='@@LONGNAME@@ <@@EMAIL@@>'
 
 
 def main():
-  pass
+    pass
 
 # If we have been called as 'python <script>' let's call main function
 if __name__ == "__main__":
-  main()
+    main()
diff --git a/vim/vimrc b/vim/vimrc
index 658552a..16d50d1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -13,6 +13,7 @@ set nohlsearch
 set nostartofline
 " set paste
 set autochdir
+set clipboard=unnamed
 
 " Let's go to 256 colors
 set t_Co=256
@@ -166,6 +167,16 @@ nnoremap <silent> <S-Up> V
 vnoremap <silent> <S-Down> j
 vnoremap <silent> <S-Up> k
 
+" Line/block move up/down
+nnoremap <CS-Down> :m .+1<CR>==
+nnoremap <CS-Up> :m .-2<CR>==
+
+inoremap <CS-Down> <Esc>:m .+1<CR>==gi
+inoremap <CS-Up> <Esc>:m .-2<CR>==gi
+
+vnoremap <CS-Down> :m '>+1<CR>gv=gv
+vnoremap <CS-Up> :m '<-2<CR>gv=gv
+
 " Terminal/Filemanager integration
 " nnoremap <silent> <F9> :OpenTerminal<CR>
 nnoremap <silent> <F10> :OpenFilemanager<CR><CR>
@@ -188,6 +199,9 @@ nnoremap <silent> <D-8> 8gt
 nnoremap <silent> <D-9> 9gt
 nnoremap <silent> <D-0> 10gt
 
+" <Leader>hh opens my help file
+nnoremap <silent> <Leader>hh :help akmap<CR>
+
 " Vim5 comes with syntaxhighlighting. If you want to enable syntaxhightlighting
 " by default uncomment the next three lines.
 if has("syntax")