various improvements to evaluation functions