Added options for ellipse/rectangle, fixed up README
Added toggling of AF highlighting