updates to fix vim a little bit more