Some work on OrbMKCircular

Some work on OrbMKCircular, plus a bit on OrbMKElliptical