Attack and Death

Attack and Death working, still some precision matters but works in
general. also corrected a little bug on detection