BUG FIX: getCircle now returns the correct radius. Some cleanups