Fixing circles, and better handling of squares