more fixes, still having bit packing issue