Repair comments, add to rigs