trade log consumption to trade model, migration tweaks