And some bugfixing

Spawning seems to work now, will have to take a look at respawning and
reviving tomorrow