Edit comments and refine RectangleZone