Cleanup, add some realtime feedback.