More Wavetronix specific updates