Added ellipse shape.
Refactored fill mode stuff.