Generalise matrix equation and fix vac wav bug

Include the cross terms from each target line in the filter of the
other.

I wasn't converting from air->vacuum in all the places I should have
done