Update kill_list and fixes #2