Fixes, tweaks in bomb