[~]  some renames
[~]  fixed memory leaks, organize queues