massive bounding refactoring and further invalidation loop-fixes