Fixed #8 and made rectangles and triangles into polygons, thus removing all draw and trace functions that aren't drawPolygon.