mainly vim improvements