Few code changes.
Tweaked the way respawning is handeled.
Also shortened some multi-line if statements.