Updated repeat and surround plugins