adding comment and surround plugins