diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index f83f01c..238b918 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -3,8 +3,8 @@
 " Author:       Maxim Kim (habamax at gmail dot com)
 " Home:         http://code.google.com/p/vimwiki/
 " Filenames:    *.wiki
-" Last Change:  (14.05.2008 17:25)
-" Version:      0.3pre
+" Last Change:  (16.05.2008 14:28)
+" Version:      0.3.1
 
 if exists("b:did_ftplugin")
   finish
@@ -52,7 +52,15 @@ imap <buffer> <Up>     <C-o>gk
 nmap <silent><buffer> <CR> :call WikiFollowWord('nosplit')<CR>
 nmap <silent><buffer> <S-CR> :call WikiFollowWord('split')<CR>
 nmap <silent><buffer> <C-CR> :call WikiFollowWord('vsplit')<CR>
+
+nmap <buffer> <S-LeftMouse> <NOP>
+nmap <buffer> <C-LeftMouse> <NOP>
+noremap <silent><buffer> <2-LeftMouse> :call WikiFollowWord('nosplit')<CR>
+noremap <silent><buffer> <S-2-LeftMouse> <LeftMouse>:call WikiFollowWord('split')<CR>
+noremap <silent><buffer> <C-2-LeftMouse> <LeftMouse>:call WikiFollowWord('vsplit')<CR>
+
 nmap <silent><buffer> <BS> :call WikiGoBackWord()<CR>
+nmap <silent><buffer> <RightMouse><LeftMouse> :call WikiGoBackWord()<CR>
 
 nmap <silent><buffer> <TAB> :call WikiNextWord()<CR>
 nmap <silent><buffer> <S-TAB> :call WikiPrevWord()<CR>
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 68f7a2b..2ee4e52 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -3,8 +3,8 @@
 " Author:       Maxim Kim (habamax at gmail dot com)
 " Home:         http://code.google.com/p/vimwiki/
 " Filenames:    *.wiki
-" Last Change:  (14.05.2008 17:24)
-" Version:      0.3 pre
+" Last Change:  (16.05.2008 14:28)
+" Version:      0.3.1
 
 
 if exists("loaded_vimwiki") || &cp
@@ -48,6 +48,9 @@ let g:vimwiki_word2 = '\[\[['.upp.low.oth.'[:punct:][:space:]]\{-}\]\]'
 let s:wiki_word = '\<'.g:vimwiki_word1.'\>\|'.g:vimwiki_word2
 let s:wiki_badsymbols = '[<>|?*/\:"]'
 
+"" need it to rename
+let s:wiki_current_word = g:vimwiki_index
+
 execute 'autocmd! BufNewFile,BufReadPost,BufEnter *'.g:vimwiki_ext.' set ft=vimwiki'
 
 
@@ -226,6 +229,7 @@ function! WikiRenameWord() "{{{
     let wwtorename = expand('%:r')
     let isOldWordComplex = 0
     if wwtorename !~ g:vimwiki_word1
+        let wwtorename = substitute(wwtorename,  g:vimwiki_stripsym, s:wiki_badsymbols, "g")
         let isOldWordComplex = 1
     endif
 
@@ -303,7 +307,8 @@ function! WikiRenameWord() "{{{
     endwhile
 
     "" DONE: after renaming GUI caption is a bit corrupted?
-    "" FIXME: buffers menu is also not in the "normal" state, howto Refresh menu?
+    "" FIXED: buffers menu is also not in the "normal" state, howto Refresh menu?
+    execute "emenu Buffers.Refresh\ menu"
 
 endfunction "}}}
 
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 613514e..20210ba 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -3,8 +3,8 @@
 " Author:       Maxim Kim (habamax at gmail dot com)
 " Home:         http://code.google.com/p/vimwiki/
 " Filenames:    *.wiki
-" Last Change:  (14.05.2008 17:25)
-" Version:      0.3pre
+" Last Change:  (16.05.2008 14:28)
+" Version:      0.3.1
 
 " Quit if syntax file is already loaded
 if version < 600