Huffman: coupla minor bug fixes, little bug still in there somewhere