ADD trade and team channel + fix map channel in fight