fix channel numbers, add more s2s options, fix s2s reconnect errors