Robustness fixed.
Cleaned the product builder.