More edits to vim script