Bomb logic fixes pt2