diff --git a/vimfiles.stefan/after/ftplugin/python.vim b/vimfiles.stefan/after/ftplugin/python.vim
index 5305679..4d6075e 100644
--- a/vimfiles.stefan/after/ftplugin/python.vim
+++ b/vimfiles.stefan/after/ftplugin/python.vim
@@ -7,7 +7,7 @@ setlocal shiftwidth=4
 setlocal formatoptions=croq
 
 function! Set_python_tag_files()
-python << endpython
+python3 << endpython
 import vim
 import sys
 import os
diff --git a/vimfiles.stefan/plugin/vimsuite.vim b/vimfiles.stefan/plugin/vimsuite.vim
index d975906..2838da9 100644
--- a/vimfiles.stefan/plugin/vimsuite.vim
+++ b/vimfiles.stefan/plugin/vimsuite.vim
@@ -220,7 +220,7 @@ function ClangFormat()
     else
         let l:lines='all'
     endif
-    pyf /usr/share/vim/addons/syntax/clang-format.py
+    py3file /usr/share/vim/addons/syntax/clang-format.py
 endfunction
 
 " delete all multiple empty lines
diff --git a/vimfiles.stefan/vimrc b/vimfiles.stefan/vimrc
index 679c762..b35a0e5 100644
--- a/vimfiles.stefan/vimrc
+++ b/vimfiles.stefan/vimrc
@@ -298,6 +298,7 @@ let g:Gitv_OpenHorizontal = 1
 " ------
 command Flake8 call Flake8()
 command PyFlake Flake8
+" Flake8 options are stored in ~/.config/flake8
 
 " -----
 " Isort