Polygon: added a TODO, removed some buggy code.