It looks weird, but subtracting 2 * width from radius makes circles draw properly.
Further circle draw changes.