fix for including attributes on products and other small fixes