ellipse support, other tweaks