Improvements to initial version of gp2.vim