diff --git a/clock.js b/clock.js
index d255d20..6132016 100644
--- a/clock.js
+++ b/clock.js
@@ -33,7 +33,6 @@ function startTime(){
                                          year:'numeric',
                                          hour:'2-digit',
                                          minute:'2-digit',
-                                         second:'2-digit',
-                                         timeZoneName:'short'});
+                                         second:'2-digit',});
   document.getElementById('JStz').innerHTML = current_tz;
 }
diff --git a/clock.php b/clock.php
index 86b4149..aaf63a8 100644
--- a/clock.php
+++ b/clock.php
@@ -42,7 +42,7 @@
           "<br><span>".
           "<p id='time_body'>".
           date("D, M d, Y, H:i:s") .
-          date(" T")."</p><p> GMT". date("O") ."</p>\n\t\t</span>";
+          "</p><p> GMT". date("O T") ."</p>\n\t\t</span>";
         ?>
       <div class="tz_select">
         <p>
@@ -57,7 +57,7 @@
         <select name="userTimezone" class="tz_select">
           <option value="Pacific/Kwajalein" >(GMT -12:00) Eniwetok, Kwajalein</option>
           <option value="Pacific/Midway" >(GMT -11:00) Midway Island, Samoa</option>
-          <option value="America/Honolulu">(GMT -10:00 Hawaii No DST</option>
+          <option value="Pacific/Honolulu">(GMT -10:00 Hawaii No DST</option>
           <option value="America/Adak" >(GMT -10:00) Hawaii</option>
           <option value="America/Anchorage"  >(GMT -9:00) Alaska</option>
           <option value="America/Los_Angeles"  >(GMT -8:00) Pacific Time (US &amp; Canada)</option>