Fix ball-bound-bouncing issue with collision and bounce refactor