Truncate Sigma if energywindow is used (for speed), some other minor
changes