Merchant, plus a small forge fix