Some small amendments to the vim code