add product category and type.  rename some fields