Some cleanup and added detection of bomb