fix suicide, change lists to sets