fix merge errors
change environment variables
fixed
try changes to server
change port
changed the port and fixed a bug with player_update_handler