clean up and rounded rects
?