Code improvments + next of survivor selection