minor improvements.

I now know that sigma contribution to X is wrong.