fixed product names and minor additions