Corrected structure packing & various cosmetics