Less time for escape, fix date, add surround to vim