diversify shapes a bit, and ditch ones that are too small