Small fixes and adding packing