package fixup & branding updates