updates and cleaning up some vim nonsense