Added Bomb proof block and tweaks