circle, rectangle, and reworking stroke and fill