retailer fixes, french fix. bunch of other things

really gotta get better at these pull request comments :/