better bomb handling
Merge