diff --git a/card/swd.js b/card/swd.js
index 397fae4d0..7656bdb0a 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -5079,6 +5079,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			longfan_info:'出牌阶段限一次，你可以进行一次判定，然后按花色执行以下效果。红桃：你回复一点体力；方片：你摸一张牌；梅花：你弃置一名其他角色的一张牌；黑桃：无事发生',
 			// longfan_info:'0000：翻面；1111：弃手牌；2222：弃装备牌；3333：受伤害；4444：流失体力；5555：连环；6666：摸牌；7777：回复体力；8888：弃置判定牌；9999：置衡',
 			guiyoujie:'鬼幽结',
+			guiyoujie_bg:'结',
 			guiyoujie_info:'出牌阶段，对一名其他角色使用。若判定结果为黑色，其摸一张牌并翻面。',
 			yufulu:'御夫录',
 			yufulu_info:'出牌阶段，可弃置一张武器牌令一名角色受到一点伤害，然后该角色获得此武器牌',
@@ -5268,7 +5269,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 
 			// ['club',1,'fengyinzhidan'],
 			// ['diamond',1,'fengyinzhidan'],
-			['heart',1,'fengyinzhidan'],
+			// ['heart',1,'fengyinzhidan'],
 			['spade',1,'fengyinzhidan'],
 
 			['heart',9,'yuruyi'],
diff --git a/character/gwent.js b/character/gwent.js
index c7814628f..da357843a 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -91,17 +91,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						trigger:{player:'phaseEnd'},
 		    			frequent:true,
 						filter:function(event,player){
-							return player.storage.zhengjun.length>=2;
+							return player.storage.zhengjun.length>=1;
 						},
 		    			content:function(){
 							'step 0'
+							if(player.storage.zhengjun.length==1){
+								player.draw();
+								event.finish();
+								return;
+							}
 							event.cards=get.cards(player.storage.zhengjun.length);
-							player.chooseCardButton('整军：获得其中一张牌',true).set('ai',function(button){
+							player.chooseCardButton('整军：获得其中一张牌',true,event.cards).set('ai',function(button){
 								return get.useful(button.link);
 							});
 							'step 1'
 							if(result.bool){
-								var card=result.cards[0];
+								var card=result.links[0];
+								card.fix();
 								player.gain(card,'draw');
 								event.cards.remove(card);
 							}
@@ -1784,7 +1790,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_zhuoertan:'卓尔坦',
 
 			zhengjun:'整军',
-			zhengjun_info:'结束阶段，若X不小于2，你可以观看牌堆顶的X张牌并获得其中一张，X为你在本局游戏中累计使用或打出过至少两张同名牌的牌数；每当X的值增加，你增加一点体力和体力上限',
+			zhengjun_info:'结束阶段，你可以观看牌堆顶的X张牌并获得其中一张，X为你在本局游戏中累计使用或打出过至少两张同名牌的牌数；每当X的值增加，你增加一点体力和体力上限',
 			gwxuezhan:'血战',
 			gwxuezhan_info:'准备阶段，若你的手牌数为全场最少或之一，你可以获得一张十字召唤',
 			jielue:'劫掠',
diff --git a/character/sp.js b/character/sp.js
index 54ae2abf2..5e8252ec0 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -987,6 +987,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                 frequent:true,
                 filter:function(event,player){
                     if(event.player.hp<=player.hp) return false;
+                    if(event.targets.length>1) return false;
                     var hs=player.getCards('h');
                     var names=['sha','shan','tao','jiu'];
                     for(var i=0;i<hs.length;i++){
diff --git a/game/game.js b/game/game.js
index 985b093f5..e16a8d561 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8105,7 +8105,7 @@
 				var mode=lib.config.all.mode.slice(0);
 				mode.remove('connect');
 				mode.remove('brawl');
-				var banned=['yxs_luzhishen','xuhuang','zhenji','shen_guanyu','zhurong',
+				var banned=['yxs_luzhishen','xuhuang','zhenji','shen_guanyu','shen_caocao','zhurong',
 					'daqiao','lingcao','liuzan','lusu','luxun','yanwen','zhouyu','xiahouyuan',
 					'zhuzhi','old_caozhen','guojia','simayi','sp_pangde','swd_kangnalishi'];
 				var bannedcards=['zengbin','toulianghuanzhu','huoshan','hongshui','guiyoujie','fengyinzhidan'];