update: mostly vim stuff
some strang changes in emacs