Minor bbox correction.
Tweaked system a little to be more compact and versatile.