Some cleanup and Structures now have Bounding Boxes