lot's of little fixes (mainly to find a retailer)