Added new respawn effects
More refactoring!