Fixed bombs more, other stuff I forgot