Added kill list and fixes #3