Simplified stuff and fixed bounding "bugs."