Add connetion retrying & fix player id confusion