Fixes the grace period

Removes the killed with gun grace period, fixes the killed with trap
grace period, and creates the ran away grace period.