Fixed bugs in BWM signal. Now compatible with Madison et al. definitions too