vim: some improvments