Add gvim options and fixes