Add survival

Add survival feature and small fixes