minor corrections to ensure everything compiles and tests pass. mainly corrects function signatures that had changed.