misc changes, mainly fix vim brokeness