Lots of tweaks to products import and model