Fixes to incorrect calculation of variance, and removal of alternative calculation method.