fixup: pass 3
I can't remember what this commit does :/
add some missing g:s