Added nuke detection + little ajustments