Lot's of minor bug fixes. Added support for hyphenated products, like all-purpose flour