cleanup, fix recorder callback