Fixed scaling issues, now forces fitXY for circle