diff --git a/index.html b/index.html
index e4112c1..6e1cd93 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,24 @@
             font-size: 8pt;
     }
     .chart { float: right; }
+    .waitboard {
+            position: absolute;
+            display: none;
+            top: 0;
+            left:0;
+            opacity: 0.6;
+            background-color: #f0f0ff;
+            width: 100%;
+            height: 100%;
+    }
+    .waititem {
+            margin: 50% auto;
+            font-size: 50px;
+            font-family: cursive;
+            color: purple;
+    }
     </style>
+    <link rel="stylesheet" href="./preloader.css">
     <script src="./amcharts/amcharts.js"></script>
     <script src="./amcharts/serial.js"></script>
     <script src="./mergeddata.json"></script>
@@ -34,9 +51,9 @@
     <div id="tempdiv" class="chart" style="width: 99%; height:50%"></div>
     <div class="group" style="width: 1%; height:50%">
         <svg id="humidgroup"  viewBox="0 0 19 270"></svg>
-	<div class="fl">
+<!--	<div class="fl">
 	気象庁:三田観測所では湿度を記録していないため、代わりに神戸の情報を表示しています
-	</div>
+	</div>-->
     </div>
     <div id="humiddiv" class="chart" style="width: 99%; height:50%"></div>
     <script>
@@ -122,8 +139,11 @@
 
 	humidgraphs.push(
 		{"type": "column", "valueField": "rainfall",
-                "fixedColumnWidth": 1,
-                "fillColors": colorss,
+		"bulletSize": 16,
+                //"fixedColumnWidth": 5,
+                "columnWidth": 60,
+                "fillAlphas": 1,
+                "color": "blue",
 		"title": "降水量(三田)", "valueAxis": "v2",
 		"balloonText": "<b>降水量 [[value]]mm</b>" });
 
@@ -195,7 +215,7 @@
             "valueText": "[[value]]℃",
             "verticalGap": 0,
             "position": "left",
-            "rollOverGraphAlpha": 0.2,
+            "rollOverGraphAlpha": 0.1,
 	    "listeners": [{
 		    "event": "rollOverItem",
 		    "method":
@@ -206,6 +226,17 @@
 				}
 			}
 	    },{
+		    "event": "clickMarker",
+		    "method":
+			function(e) {
+			    if (e.dataItem.hidden) {
+				let i = e.dataItem.index;
+				humidchart.hideGraph(humidchart.graphs[i]);
+			    } else {
+				humidchart.showGraph(humidchart.graphs[e.dataItem.index]);
+			    }
+			}
+	    },{
 		    "event": "rollOutItem",
 		    "method":
 			function(e) {
@@ -246,6 +277,7 @@
         "dataProvider": data,
         "categoryField": "datetime",
         "valueAxes": [{
+            id: 'v1',
 	    guides: [{
 		value: 30,
 		toValue: 70,
@@ -257,7 +289,7 @@
                  id: 'v2',
                  axisAlpha: 0,
                  labelsEnabled: false,
-                 maximum:100,
+                 maximum:49,
         }],
         "listeners": [{
             "event": "zoomed",
@@ -319,6 +351,18 @@
 				}
 			}
 	    },{
+		    "event": "clickMarker",
+		    "method":
+			function(e) {
+			    if (e.dataItem.hidden) {
+				let i = e.dataItem.index;
+				tempchart.hideGraph(tempchart.graphs[i]);
+			    } else {
+				let i = e.dataItem.index;
+				tempchart.showGraph(tempchart.graphs[i]);
+			    }
+			}
+	    },{
 		    "event": "rollOutItem",
 		    "method":
 			function(e) {
@@ -446,27 +490,36 @@
     makeGroup(11, 14, "red");
 
     function toggle_graphs(state,chart) {
-        function inner(i, args) {
-            if (i < args.length-1) {
-                setTimeout(function() {inner(i+1, args);}, 0);
-            }
-            if (state) {
-                tempchart.showGraph(tempchart.graphs[args[i]]);
-                humidchart.showGraph(humidchart.graphs[args[i]]);
-            } else {
-                tempchart.hideGraph(tempchart.graphs[args[i]]);
-                humidchart.hideGraph(humidchart.graphs[args[i]]);
-            }
-        }
-        inner(1, arguments);
+	    let args = Array.from(arguments);
+	    let wait = document.querySelector(".waitboard");
+	    let sentinel = args[args.length-1];
+	    wait.style.display = "block";
+	    function inner(i) {
+		    if (state) {
+			tempchart.showGraph(tempchart.graphs[args[i]]);
+			humidchart.showGraph(humidchart.graphs[args[i]]);
+		    } else {
+			tempchart.hideGraph(tempchart.graphs[args[i]]);
+			humidchart.hideGraph(humidchart.graphs[args[i]]);
+		    }
+		    if (i < sentinel) {
+			setTimeout(function() {inner(i+1);}, 0);
+		    } else {
+			wait.style.display = "none";
+		    }
+	    }
+	    inner(1);
     }
 
 
     window.onkeydown = function(e) {
         switch (e.keyCode) {
             case 191:
-                alert("?\thelp\ni\tIST\t\t(toggle)\nh\tHSJ\t\t(toggle)\nf\tField\t(toggle)\no\toutside\t(toggle)");
+                alert("?   help\nc   ALL clear     (toggle)\ni   IST     (toggle)\nh   HSJ     (toggle)\nf   Field     (toggle)\no   outside     (toggle)");
                 break;
+            case 67:
+                toggle_graphs(tempchart.graphs[0].hidden, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
+		break;
             case 73:
                 toggle_graphs(tempchart.graphs[3].hidden, 3,4,5,6,7);
                 break;
@@ -486,5 +539,11 @@
     };
 
     </script>
+    <div class="waitboard">
+       <div class="waititem">
+          <center>Changing....</center>
+          <div id="preloader_1"><span></span><span></span><span></span><span></span><span></span></div>
+       </div>
+    </div>
 </body>
 </html>
diff --git a/jma.sh b/jma.sh
index 2fba8b4..d5b3ee4 100755
--- a/jma.sh
+++ b/jma.sh
@@ -2,7 +2,7 @@
 # script to retrieve weather information from JMA.
 
 # first dummy access to get session id for the request.
-sid=$(curl -s http://www.data.jma.go.jp/risk/obsdl/ | sed  -n -e '/id="sid"/s/^.*value="\(.*\)".*$/\1/p')
+sid=$(curl -s https://www.data.jma.go.jp/risk/obsdl/ | sed  -n -e '/id="sid"/s/^.*value="\(.*\)".*$/\1/p')
 
 # make date priod (today and '15 days before').
 F_Y=$(date +%Y)
@@ -27,7 +27,7 @@
 mv -f JMA.csv.xz.002 JMA.csv.xz.003
 mv -f JMA.csv.xz.001 JMA.csv.xz.002
 mv -f JMA.csv.xz     JMA.csv.xz.001
-curl -s --data "${postmsg}"  http://www.data.jma.go.jp/risk/obsdl/show/table > data.csv
+curl -s --data "${postmsg}"  https://www.data.jma.go.jp/risk/obsdl/show/table > data.csv
 
 # convert data.csv to JMA.csv which only pickups necessary points
 ./out.py > JMA.csv