more payload changes and a quick server fix