further improvements on scoring