Expands kill list and fixes #3