new packages and comment tweaks