minor tweaks to muxing