diff --git a/ftplugin/python/common.vim b/ftplugin/python/common.vim
index 2b786c9..a156a09 100644
--- a/ftplugin/python/common.vim
+++ b/ftplugin/python/common.vim
@@ -33,6 +33,11 @@ let g:pyflakes_use_quickfix = 0
 autocmd BufWinLeave *.py mkview
 autocmd BufWinEnter *.py silent loadview
 
+"Something bad happens for python comments - it places 2 spaces instead of 1
+"after the # sign. Workaround:
+let g:NERDCustomDelimiters = {'python': {'left': '#'}}
+let g:NERDSpaceDelims = 0
+
 finish "end here. all below is just for the record.
 
 " Pylint function, which can be optionally mapped to some keys. Currently
diff --git a/vimrc b/vimrc
index e3bffe9..e2daab0 100644
--- a/vimrc
+++ b/vimrc
@@ -13,6 +13,7 @@ Plug 'ervandew/taglisttoo'
 Plug 'fs111/pydoc.vim'
 Plug 'gryf/mark'
 Plug 'gryf/pythonhelper'
+Plug 'gryf/tagbar', {'branch': 'show_tag_kind2'}
 Plug 'gryf/zoom.vim'
 Plug 'hallison/vim-markdown'
 Plug 'honza/vim-snippets'
@@ -21,7 +22,6 @@ Plug 'kazuyukitanimura/jsbeautify'
 " Plug 'kevinw/pyflakes-vim'  " deprecated, use syntastic instead
 Plug 'kien/ctrlp.vim'
 " Plug 'majutsushi/tagbar'
-Plug 'gryf/tagbar', {'branch': 'show_tag_kind2'}
 Plug 'mattn/calendar-vim'
 Plug 'mduan/python.vim'
 Plug 'mikeage/occur.vim'
@@ -30,6 +30,7 @@ Plug 'myhere/vim-nodejs-complete'
 Plug 'othree/html5.vim'
 Plug 'pangloss/vim-javascript'
 Plug 'pcaro90/jpythonfold.vim'
+Plug 'rust-lang/rust.vim'
 Plug 'scrooloose/nerdcommenter'
 Plug 'scrooloose/nerdtree'
 Plug 'scrooloose/syntastic'