moved player_spawn() andchanged some names