Attempt to add back boundingbox
More progress on bounding boxes
Remove debug statements
Generalize zero comparisons in boundingbox. Etc.