More work on TfIdf scoring code