a few style things, fix cart_form for not using flexi_variants, etc