correct packaging and some minor tweaks