Resolving requeue and other small issues per ticket #16.