Bit of debugging on switch to sigma from sigma_A/AV. Runs, and doesn't produce crazy results. Doesn't mean it's right, of course...