added killing and renamed a few things