more package tweaks