Fixed spawning to proper locations

Still have to check that the spawn position is not already taken, will
update that with next commit