bring back callbacks, remove events, end -> finished
update test for progress-stream