Add crosstalk knob, some code changes