partial checkout multi-item packages and refactor/repair