more changes, fixes, respawn code