A few more tweaks to MC algo...