More kills, fixes #3