Fixed lots of things: circles, data generation, etc.