Right on all counts. I can sort of see an argument for the idea that the fuel wouldn't do them any good without the command module, but in that case the story should have been that the aliens needed to get fuel down to the module, which takes the whole prison camp thing out of the story altogether.