move to jeformat, add rpc recoveries, various fixes from M6