diff --git a/doc/join.txt b/doc/join.txt
index c74799a..b44757c 100644
--- a/doc/join.txt
+++ b/doc/join.txt
@@ -7,9 +7,9 @@ CONTENTS                                                 *smart-join-contents*
 2. Variables .......................................... |smart-join-variables|
 
 ==============================================================================
-Section 1: Usage                                             *highlight-usage*
+Section 1: Usage                                            *smart-join-usage*
 
-<Plug>SmartJoin      Performs a smart join on [count] line and the one below
+J                    Performs a smart join on [count] line and the one below
                      it. If [count] is too big it is reduced to the number of
                      lines available. Fails when on the last line of the
                      buffer.
diff --git a/doc/tags b/doc/tags
new file mode 100644
index 0000000..6324772
--- /dev/null
+++ b/doc/tags
@@ -0,0 +1,4 @@
+smart-join	join.txt	/*smart-join*
+smart-join-contents	join.txt	/*smart-join-contents*
+smart-join-usage	join.txt	/*smart-join-usage*
+smart-join-variables	join.txt	/*smart-join-variables*
diff --git a/plugin/join.vim b/plugin/join.vim
index 0e12649..d115038 100644
--- a/plugin/join.vim
+++ b/plugin/join.vim
@@ -123,7 +123,7 @@ endfunction
 
 function! g:SaveCursorSmartJoin(count)
   let l:curpos = getcurpos()
-  call s:SmartJoin(a:count - 1)
+  call s:SmartJoin(a:count)
   call setpos('.', l:curpos)
 endfunction
 
@@ -131,5 +131,7 @@ endfunction
 " MAPPINGS: {{{1
 " ==============================================================================
 
-noremap <Plug>SmartJoin :<C-U> call g:SaveCursorSmartJoin(v:count1)<CR>
+nmap <Plug>SmartJoin :<C-U> call g:SaveCursorSmartJoin(v:count1)<CR>
+
+nmap J <Plug>SmartJoin