Added some Vim markers etc