Update the kill list and fixes #3