Added bounding boxes
Fixed BBs