Fixes to bounds maintenance. Scaling now works correctly.