Added status types for makeup / breakup bundled skus
Bug fix and cleanup