Support for MW iteration.
Fix error in scoring function