fixes to reflect changes in factorie