diff --git a/Resources.qrc b/Resources.qrc
index 266b9433..18f45453 100644
--- a/Resources.qrc
+++ b/Resources.qrc
@@ -40,5 +40,6 @@
         <file>icons/session-off.png</file>
         <file>icons/session-on.png</file>
         <file>icons/bob-v3.0.png</file>
+        <file>docs/script.js</file>
     </qresource>
 </RCC>
diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro
index 1beb1a01..bd7ba679 100644
--- a/SleepyHeadQT.pro
+++ b/SleepyHeadQT.pro
@@ -185,7 +185,8 @@ OTHER_FILES += \
     docs/countries.txt \
     docs/tz.txt \
     LICENSE.txt \
-    docs/tooltips.css
+    docs/tooltips.css \
+    docs/script.js
 
 
 
diff --git a/docs/script.js b/docs/script.js
new file mode 100644
index 00000000..43b31777
--- /dev/null
+++ b/docs/script.js
@@ -0,0 +1,77 @@
+/* Borrowed from Michael Leigeber
+http://sixrevisions.com/tutorials/javascript_tutorial/create_lightweight_javascript_tooltip/
+*/
+var tooltip=function(){
+	var id = 'tt';
+	var top = 3;
+	var left = 3;
+	var maxw = 300;
+	var speed = 10;
+	var timer = 20;
+	var endalpha = 95;
+	var alpha = 0;
+	var tt,t,c,b,h;
+	var ie = document.all ? true : false;
+	return{
+		show:function(v,w){
+			if(tt == null){
+				tt = document.createElement('div');
+				tt.setAttribute('id',id);
+				t = document.createElement('div');
+				t.setAttribute('id',id + 'top');
+				c = document.createElement('div');
+				c.setAttribute('id',id + 'cont');
+				b = document.createElement('div');
+				b.setAttribute('id',id + 'bot');
+				tt.appendChild(t);
+				tt.appendChild(c);
+				tt.appendChild(b);
+				document.body.appendChild(tt);
+				tt.style.opacity = 0;
+				tt.style.filter = 'alpha(opacity=0)';
+				document.onmousemove = this.pos;
+			}
+			tt.style.display = 'block';
+			c.innerHTML = v;
+			tt.style.width = w ? w + 'px' : 'auto';
+			if(!w && ie){
+				t.style.display = 'none';
+				b.style.display = 'none';
+				tt.style.width = tt.offsetWidth;
+				t.style.display = 'block';
+				b.style.display = 'block';
+			}
+			if(tt.offsetWidth > maxw){tt.style.width = maxw + 'px'}
+			h = parseInt(tt.offsetHeight) + top;
+			clearInterval(tt.timer);
+			tt.timer = setInterval(function(){tooltip.fade(1)},timer);
+		},
+		pos:function(e){
+			var u = ie ? event.clientY + document.documentElement.scrollTop : e.pageY;
+			var l = ie ? event.clientX + document.documentElement.scrollLeft : e.pageX;
+			tt.style.top = (u - h) + 'px';
+			tt.style.left = (l + left) + 'px';
+		},
+		fade:function(d){
+			var a = alpha;
+			if((a != endalpha && d == 1) || (a != 0 && d == -1)){
+				var i = speed;
+				if(endalpha - a < speed && d == 1){
+					i = endalpha - a;
+				}else if(alpha < speed && d == -1){
+					i = a;
+				}
+				alpha = a + (i * d);
+				tt.style.opacity = alpha * .01;
+				tt.style.filter = 'alpha(opacity=' + alpha + ')';
+			}else{
+				clearInterval(tt.timer);
+				if(d == -1){tt.style.display = 'none'}
+			}
+		},
+		hide:function(){
+			clearInterval(tt.timer);
+			tt.timer = setInterval(function(){tooltip.fade(-1)},timer);
+		}
+	};
+}();
diff --git a/docs/tooltips.css b/docs/tooltips.css
index 92c1a24d..3f791f51 100644
--- a/docs/tooltips.css
+++ b/docs/tooltips.css
@@ -43,4 +43,12 @@ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0,
 a:link, a:visited { color: inherit; text-decoration: none; font-weight: normal;}
 a:hover { background-color: inherit; color: blue; text-decoration:none; font-weight: normal; }
 
+#text {margin:50px auto; width:500px}
+.hotspot {color:#900; padding-bottom:1px; border-bottom:1px dotted #900; cursor:pointer}
+
+#tt {position:absolute; display:block; background:url(images/tt_left.gif) top left no-repeat}
+#tttop {display:block; height:5px; margin-left:5px; background:url(images/tt_top.gif) top right no-repeat; overflow:hidden}
+#ttcont {display:block; padding:2px 12px 3px 7px; margin-left:5px; background:#666; color:#FFF}
+#ttbot {display:block; height:5px; margin-left:5px; background:url(images/tt_bottom.gif) top right no-repeat; overflow:hidden}
+
 </style>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 87021976..8d16389c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -373,7 +373,8 @@ void MainWindow::on_action_Fullscreen_triggered()
 
 QString htmlHeader()
 {
-//   "a:link,a:visited { color: '#000020'; text-decoration: none; font-weight: bold;}"
+
+    //   "a:link,a:visited { color: '#000020'; text-decoration: none; font-weight: bold;}"
 //   "a:hover { background-color: inherit; color: red; text-decoration:none; font-weight: bold; }"
     return QString("<html><head>"
 "</head>"
@@ -382,7 +383,6 @@ QString htmlHeader()
 "p,a,td,body { font-size: 14px }"
 "</style>"
 "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />"
-
 "<script type='text/javascript'>"
 "function ChangeColor(tableRow, highLight)"
 "{ tableRow.style.backgroundColor = highLight; }"
@@ -853,6 +853,9 @@ void MainWindow::on_summaryButton_clicked()
                     min=day->settings_min(CPAP_Pressure);
                 }
                 if ((mode!=cmode) || (min!=cmin) || (max!=cmax) || (maxhi!=cmaxhi) || (day->machine!=lastmach) || (prelief!=lastpr))  {
+                    if (!lastmach) { // set early.
+                        lastmach=day->machine;
+                    }
                     if (cmode!=MODE_UNKNOWN) {
                         first=date.addDays(1);
                         int days=PROFILE.countDays(MT_CPAP,first,last);
@@ -867,6 +870,7 @@ void MainWindow::on_summaryButton_clicked()
                         rx.maxhi=cmaxhi;
                         rx.prelief=lastpr;
                         rx.prelset=lastprelset;
+                        rx.machine=lastmach;
 
                         if (mode<MODE_BIPAP) {
                             rx.per1=p_profile->calcPercentile(CPAP_Pressure,percentile,MT_CPAP,first,last);
@@ -876,7 +880,7 @@ void MainWindow::on_summaryButton_clicked()
                             rx.per2=p_profile->calcPercentile(CPAP_IPAP,percentile,MT_CPAP,first,last);
                         } else {
                             rx.per1=p_profile->calcPercentile(CPAP_EPAP,percentile,MT_CPAP,first,last);
-                            rx.per2=p_profile->calcPercentile(CPAP_IPAPHi,percentile,MT_CPAP,first,last);
+                            rx.per2=p_profile->calcPercentile(CPAP_IPAP,percentile,MT_CPAP,first,last);
                         }
                         rx.weighted=float(rx.days)/float(cpapdays)*rx.ahi;
                         rxchange.push_back(rx);
@@ -1036,6 +1040,7 @@ void MainWindow::on_summaryButton_clicked()
         html+=QString("<br/><b>Changes to Prescription Settings</b>");
         html+=QString("<table cellpadding=2 cellspacing=0 border=1 width=90%>");
         QString extratxt;
+
         if (cpapmode>=MODE_ASV) {
             extratxt=QString("<td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td>")
                 .arg(tr("EPAP")).arg(tr("IPAPLo")).arg(tr("IPAPHi")).arg(tr("%1% EPAP").arg(percentile*100.0)).arg(tr("%1% IPAP").arg(percentile*100.0));
@@ -1049,7 +1054,8 @@ void MainWindow::on_summaryButton_clicked()
             extratxt=QString("<td><b>%1</b></td>")
                 .arg(tr("Pressure"));
         }
-        html+=QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td><td><b>%6</b></td>%7</tr>")
+        QString tooltip;
+        html+=QString("<tr title='%8'><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td><td><b>%6</b></td>%7</tr>")
                   .arg(tr("First"))
                   .arg(tr("Last"))
                   .arg(tr("Days"))
@@ -1070,20 +1076,51 @@ void MainWindow::on_summaryButton_clicked()
             } else if (rx.highlight==4) {
                 color="#ffc0c0";
             } else color="";
+            QString machstr;
+            if (rx.machine->properties.contains(STR_PROP_Brand))
+                machstr+=rx.machine->properties[STR_PROP_Brand];
+            if (rx.machine->properties.contains(STR_PROP_Model)) {
+                 machstr+=" "+rx.machine->properties[STR_PROP_Model];
+            }
+
             if(cpapmode>=MODE_ASV) {
                 extratxt=QString("<td>%1</td><td>%2</td><td>%3</td><td>%4</td>")
                         .arg(rx.max,0,'f',2).arg(rx.maxhi,0,'f',2).arg(rx.per1,0,'f',2).arg(rx.per2,0,'f',2);
+                tooltip=tr("%5 %1% EPAP=%2 %3% IPAP %4")
+                        .arg(percentile*100.0)
+                        .arg(rx.per1,0,'f',2)
+                        .arg(percentile*100.0)
+                        .arg(rx.per2,0,'f',2)
+                        .arg(machstr)
+                        ;
             } else if (cpapmode>=MODE_BIPAP) {
                 extratxt=QString("<td>%1</td><td>%2</td><td>%3</td>").arg(rx.max,0,'f',2).arg(rx.per1,0,'f',2).arg(rx.per2,0,'f',2);
+                tooltip=tr("%5 %1% EPAP=%2 %3% IPAP %4")
+                        .arg(percentile*100.0)
+                        .arg(rx.per1,0,'f',2)
+                        .arg(percentile*100.0)
+                        .arg(rx.per2,0,'f',2)
+                        .arg(machstr)
+                        ;
             } else if (cpapmode>MODE_CPAP) {
                 extratxt=QString("<td>%1</td><td>%2</td>").arg(rx.max,0,'f',2).arg(rx.per1,0,'f',2);
-            } else extratxt="";
+                tooltip=tr("%3 %1% Pressure=%2")
+                        .arg(percentile*100.0)
+                        .arg(rx.per1,0,'f',2)
+                        .arg(machstr)
+                        ;
+            } else {
+                extratxt="";
+                tooltip=QString("%1")
+                .arg(machstr)
+                ;
+            }
             QString presrel;
             if (rx.prelset>0) {
                 presrel=schema::channel[CPAP_PresReliefType].option(int(rx.prelief));
                 presrel+=QString(" x%1").arg(rx.prelset);
             } else presrel="None";
-            html+=QString("<tr bgcolor='"+color+"' onmouseover='ChangeColor(this, \"#dddddd\");' onmouseout='ChangeColor(this, \""+color+"\");' onclick='alert(\"overview=%1,%2\");'><td>%3</td><td>%4</td><td>%5</td><td>%6</td><td>%7</td><td>%8</td><td>%9</td>%10</tr>")
+            html+=QString("<tr bgcolor='"+color+"' onmouseover='ChangeColor(this, \"#dddddd\"); tooltip.show(\"%11\");' onmouseout='ChangeColor(this, \""+color+"\"); tooltip.hide();' onclick='alert(\"overview=%1,%2\");'><td>%3</td><td>%4</td><td>%5</td><td>%6</td><td>%7</td><td>%8</td><td>%9</td>%10</tr>")
                     .arg(rx.first.toString(Qt::ISODate))
                     .arg(rx.last.toString(Qt::ISODate))
                     .arg(rx.first.toString(Qt::SystemLocaleShortDate))
@@ -1093,7 +1130,8 @@ void MainWindow::on_summaryButton_clicked()
                     .arg(schema::channel[CPAP_Mode].option(int(rx.mode)-1))
                     .arg(presrel)
                     .arg(rx.min,0,'f',2)
-                    .arg(extratxt);
+                    .arg(extratxt)
+                    .arg(tooltip);
         }
         html+="</table>";
         html+=QString("<i>The above has a threshold which excludes day counts less than %1 from the best/worst highlighting</i><br/>").arg(rxthresh);
@@ -1127,6 +1165,7 @@ void MainWindow::on_summaryButton_clicked()
         html+="</table>";
         html+="</div>";
     }
+    html+="<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
     updateFavourites();
     html+=htmlFooter();
     //QWebFrame *frame=ui->summaryView->page()->currentFrame();
@@ -2077,7 +2116,8 @@ void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
             sess->m_sph.clear();
             sess->m_avg.clear();
             sess->m_wavg.clear();
-            //sess->m_90p.clear();
+            sess->m_valuesummary.clear();
+            sess->m_timesummary.clear();
             sess->m_firstchan.clear();
             sess->m_lastchan.clear();
             sess->SetChanged(true);