adding second swap and some vim stuff