bug fixes and testing for multiplexed protocol