bunch of vim stuff added