added ability to draw rects and circles