Fix DeathBans and refactor a few things