vim: some changes