Modify kill list and fixes #3