Collision detection, scoreboard, and misc adjustments