various evaluation function improvements

It's pretty much all done, just a  matter of fitting it all together
now...