diff --git a/src/main/java/com/ntlab/irisserver/entities/Turn.java b/src/main/java/com/ntlab/irisserver/entities/Turn.java
index 9f15214..80c74ca 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Turn.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Turn.java
@@ -18,7 +18,7 @@
     private int max;
 
     @JsonProperty("turnstate")
-    private int turnstate;
+    private int turnstate; //0:スパイマスターのターン 1:諜報員のターン
 
     @JsonProperty("gamestate")
     private int gamestate;//0:turn継続, 1:turn終了, 2:game終了
diff --git a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java
index 909a0b1..6fe9806 100644
--- a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java
+++ b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java
@@ -17,7 +17,10 @@
     private int max;
 
     @JsonProperty("turnstate")
-    private int turnstate;
+    private int turnstate; //0:スパイマスターのターン 1:諜報員のターン
+
+    @JsonProperty("gamestate")
+    private int gamestate; //0:turn継続, 1:turn終了, 2:game終了
 
     private List<Integer> openlist = new ArrayList<>();
 
@@ -29,42 +32,7 @@
         max = t.getMax();
         openlist = t.getOpenListAll();
         turnstate = t.getTurnstate();
+        gamestate = t.getGamestate();
     }
 
-    //---------------------------------------------------------
-    //ゲッター
-
-    public String getHint() {return hint;}
-
-    public String getTeam() {return team;}
-
-    public int getMax() {return max;}
-
-    public List<Integer> getOpenListAll() {return openlist;} //リストそのものを返す。
-
-    public int getTurnstate() {return turnstate;}
-
-    //---------------------------------------------------------
-    //セッター
-
-    public void setHint(String hint) {this.hint = hint;}
-
-    public void setTeam(String team) {this.team = team;}
-
-    public void setMax(int max) {this.max = max;}
-
-    public void setTurnstate(int turnstate) {this.turnstate = turnstate;}
-
-    //---------------------------------------------------------
-    //openlist操作
-
-    public Integer getOpenListSolo(int num){return openlist.get(num);}
-
-    public void addOpenList(Integer cno){openlist.add(cno);}
-
-    public void delieteOpenList(int num){openlist.remove(num);}
-
-    public int sizeOpenList(){return openlist.size();}
-
-
 }
diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
index a3dbafa..ff577c4 100644
--- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
@@ -89,7 +89,7 @@
     //------------------------------------------------------------------------
     // rooms/{rid}/game/turns/{tno}/max:
 /*
-    @PUT //いらんかも
+    @PUT //putHintに吸収合併
     @Path("/{rid}/game/turns/{tno}/max")
     public void putMax(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("max") int max){
 
@@ -104,7 +104,7 @@
     //------------------------------------------------------------------------
     // rooms/{rid}/game/turns/{tno}/questions:
 
-    @GET //カードごとの疑っている人のリストを取得...は動かなくて糞
+    @GET //カードごとの疑っている人のリストを取得...は動いてんのかな？
     @Path("/{rid}/game/turns/{tno}//questions")
     @Produces(MediaType.APPLICATION_JSON)
     public List<Member>[] getqmember(@PathParam("rid") String rid, @PathParam("tno") int tno){