Upgraded to latest core.logic
Improved scoring function