Improve bounding-boxes