Fixed double spawn

Cleaned up some code
Respawning (after death) rewritten