try out whether multiple categories for new pkgs
fix some wraps