New good stuff for Vim with small changes to WMFS.