Add Ellipse support. Some reformatting.