Updated commentary and surround plugins