Some cleanup. Circles are settling nicely.