circle stuff fixes