Refactor queue
Refactor queue
refacteur collecteor queue
small fixes in recorder