Added vim -X and some cleanup of comments