Fix penalty.
Merge branch 'evaluation-improving' into hsgs

Update fixes.