packaging tweaks