Better beziers, triangulation. Added circle.