Carp  fix queues and tests v4

Fixes to commit messages and such, including merging commits 4 and 5