More misc scoring function enhancements