Square, polygon, and circle, arc.  Added docstrings