Draw more bounding boxes on -d.

Fixes #4