diff --git a/vimfiles.stefan/plugin/toptica.vim b/vimfiles.stefan/plugin/toptica.vim
index 6173897..cfabebf 100644
--- a/vimfiles.stefan/plugin/toptica.vim
+++ b/vimfiles.stefan/plugin/toptica.vim
@@ -31,7 +31,7 @@ function s:ProjectDlcproSet(project_type, project_base_dir)
         set wildignore+=**/shg-firmware/**
     elseif (g:project_type == 'shg')
         let s:Program = '/device-control/device-control-shg'
-        set wildignore+=**/firmware/**
+        set wildignore+=**/firmware/src/device-control/**
     elseif (g:project_type == 'topmode')
         let s:Program = '/topmode'
     elseif (g:project_type == 'topmode-gui')
@@ -212,6 +212,23 @@ function ClangFormat()
     pyf /usr/share/vim/addons/syntax/clang-format.py
 endfunction
 
+" ======
+" Pytest
+" ======
+command! -nargs=* Pytest call s:Pytest('<args>')
+function s:Pytest(testscripts)
+    let async_mode = 0
+    let archive_dir = g:ProjectBuildDir."/artifacts"
+    call asyncrun#quickfix_toggle(10, 1)
+    let args = ''
+    let args .= ' --target_ip="'.g:GdbHost.'"'
+    let args .= ' --version_file="'.archive_dir.'/VERSION'.'"'
+    let args .= ' --svnrevision_file="'.archive_dir.'/svnrevision.h'.'"'
+    let args .= ' --firmware_file="'.archive_dir.'/DLCpro-archive.fw'.'"'
+    let args .= ' --capture=no'
+    execute 'AsyncRun -mode='.async_mode.' -save=2 -cwd='.s:ProjectSrcDir.'/test @ python3 -m pytest '.args.' '.a:testscripts
+endfunction
+
 " ===============
 " Stash / Unstash
 " ===============
diff --git a/vimfiles.stefan/plugin/vimsuite.vim b/vimfiles.stefan/plugin/vimsuite.vim
index 2069939..f23a336 100644
--- a/vimfiles.stefan/plugin/vimsuite.vim
+++ b/vimfiles.stefan/plugin/vimsuite.vim
@@ -567,4 +567,14 @@ endfunction
 let g:vc_ignore_repos="-git"
 let g:vc_browse_cach_all = 1
 
+" -------
+" Tail -f
+" -------
+command TailOn let g:TailTimer = timer_start(500, 'Tail', {'repeat': -1})
+command TailOff call timer_stop(g:TailTimer)
+function Tail(timer)
+    silent edit
+    silent normal G
+endfunction
+
 EchoDebug 'loaded tools.vim'
diff --git a/vimfiles.stefan/vimrc b/vimfiles.stefan/vimrc
index f83caff..80b8417 100644
--- a/vimfiles.stefan/vimrc
+++ b/vimfiles.stefan/vimrc
@@ -156,6 +156,7 @@ set backspace=indent
 set backspace+=start
 " mark word under cursor
 nnoremap gm :let @/ = "<C-R><C-W>"<CR>:set hlsearch<CR>
+vnoremap gm y:let @/ = "<C-R>0"<CR>:set hlsearch<CR>
 " go to tag under cursor
 nnoremap tt g<C-]>
 " find next error
@@ -317,6 +318,7 @@ packadd! rtags
 packadd! sessionman
 packadd! SrchRplcHiGrp
 packadd! tagbar
+"packadd! tail
 packadd! tcomment
 packadd! vc
 packadd! vimagit