diff --git a/app/common/javascript/maps.js b/app/common/javascript/maps.js
index 5d0b7f9e3..e8d7ab069 100644
--- a/app/common/javascript/maps.js
+++ b/app/common/javascript/maps.js
@@ -32,7 +32,7 @@ KGOMapLoader.prototype.showDefaultCallout = function() {
     for (var id in this.placemarks) {
         count++;
         thePlacemark = id;
-        break;
+        //break;
     }
 
     if (count == 1) {
diff --git a/app/modules/admin/css/compliant-computer.css b/app/modules/admin/css/compliant-computer.css
index 88c5691f9..b5124d413 100644
--- a/app/modules/admin/css/compliant-computer.css
+++ b/app/modules/admin/css/compliant-computer.css
@@ -140,6 +140,8 @@ nav ul ul a {
 	-webkit-box-shadow: 1px 1px 3px #999;
 	-moz-box-shadow: 1px 1px 3px #999;
 	padding: 18px 16px;
+	overflow:auto;
+	width:610px;
 }
 #content h1 {
 	font-size: 30px;
@@ -691,7 +693,7 @@ h1 img {
 }
 
 #adminSections {
-    height:30px;
+    min-height:30px;
     margin: 0;
     padding: 0 0 10px 0;
     border-bottom: 1px solid #ddd;
diff --git a/app/modules/admin/javascript/modules-common.js b/app/modules/admin/javascript/modules-common.js
index a134be6d4..b7426c114 100644
--- a/app/modules/admin/javascript/modules-common.js
+++ b/app/modules/admin/javascript/modules-common.js
@@ -154,6 +154,7 @@ function processModuleSections(data) {
         }
         $("#adminSections").append(li);
     });
+    $("#adminSections").append('<div style="clear:both"></div>');
 }
     
 function processModuleData(data) {
diff --git a/app/modules/athletics/config/admin-module.json b/app/modules/athletics/config/admin-module.json
index 308dc98a3..b951e6f47 100644
--- a/app/modules/athletics/config/admin-module.json
+++ b/app/modules/athletics/config/admin-module.json
@@ -38,7 +38,7 @@
             "BASE_URL":{"key":"BASE_URL","labelKey":"ATHLETICS_ADMIN_SCHEDULE_URL_TITLE", "descriptionKey":"ATHLETICS_ADMIN_SCHEDULE_URL_DESCRIPTION", "type":"text","omitBlankValue":true},
             "RETRIEVER_CLASS":{"labelKey":"ATHLETICS_ADMIN_SCHEDULE_RETRIEVER_TITLE", "descriptionKey":"ATHLETICS_ADMIN_SCHEDULE_RETRIEVER_DESCRIPTION", "type":"select","optionsMethod":["AthleticEventsDataModel","getAthleticScheduleRetrievers"],"omitBlankValue":true},
             "SPORT":{"key":"SPORT","labelKey":"ATHLETICS_ADMIN_SCHEDULE_SPORT_TITLE", "descriptionKey":"ATHLETICS_ADMIN_SCHEDULE_SPORT_DESCRIPTION", "type":"text","showIf":["RETRIEVER_CLASS","CSTVDataRetriever"],"omitBlankValue":true},
-            "PARSER_CLASS":{"labelKey":"ATHLETICS_ADMIN_SCHEDULE_PARSER_TITLE", "descriptionKey":"ATHLETICS_ADMIN_SCHEDULE_PARSER_DESCRIPTION", "type":"text","omitBlankValue":true,"showIf":["RETRIEVER_CLASS","URLDataRetriever"],"default":"ICSDataParser"}
+            "PARSER_CLASS":{"labelKey":"ATHLETICS_ADMIN_SCHEDULE_PARSER_TITLE", "descriptionKey":"ATHLETICS_ADMIN_SCHEDULE_PARSER_DESCRIPTION", "type":"text","omitBlankValue":true,"showIf":["RETRIEVER_CLASS","URLDataRetriever"],"default":"ICSAthleticParser"}
         },
         "sectionindex":"string",
         "sectionsmethod":"loadScheduleData",
diff --git a/app/modules/photos/PhotosWebModule.php b/app/modules/photos/PhotosWebModule.php
index 9a87c02e1..7c704c846 100644
--- a/app/modules/photos/PhotosWebModule.php
+++ b/app/modules/photos/PhotosWebModule.php
@@ -43,8 +43,12 @@ private function getSectionsFromFeeds($feeds) {
     }
 
   protected function timeText($photo, $timeOnly=false) {
-    includePackage('Calendar');
-        return DateFormatter::formatDate($photo->getPublished(), DateFormatter::SHORT_STYLE, DateFormatter::SHORT_STYLE);
+    if ($photo->getPublished()) {
+        includePackage('Calendar');
+            return DateFormatter::formatDate($photo->getPublished(), DateFormatter::SHORT_STYLE, DateFormatter::SHORT_STYLE);
+    } else {
+        return "";
+    }
   }
 
     protected function initializeForPage() {
@@ -132,10 +136,11 @@ protected function initializeForPage() {
             	$controller = $this->getFeed($album);
                 $id = base64_decode($this->getArg('id'));
                 $photo = $controller->getPhoto($id);
-                $this->assign('photoURL',    $photo->getUrl());
-                $this->assign('photoTitle',  $photo->getTitle());
-                $this->assign('photoAuthor', $photo->getAuthor());
-                $this->assign('photoDate',   $this->timeText($photo));
+                $this->assign('photoURL',           $photo->getUrl());
+                $this->assign('photoTitle',         $photo->getTitle());
+                $this->assign('photoAuthor',        $photo->getAuthor());
+                $this->assign('photoDate',          $this->timeText($photo));
+                $this->assign('photoDescription',   $photo->getDescription());
                 
                 break;
         }
diff --git a/app/modules/photos/templates/show.tpl b/app/modules/photos/templates/show.tpl
index 9c79d7559..7cc565db9 100644
--- a/app/modules/photos/templates/show.tpl
+++ b/app/modules/photos/templates/show.tpl
@@ -7,8 +7,15 @@
 <div class="nonfocal">
 	<h1 class="slugline">{$photoTitle}</h1>
 	<p class="fineprint">
+	{if $photoDescription}
+		<br/>
+		{$photoDescription}
+	{/if}
 	{$photoAuthor}<br/>
-    {$photoDate}
+	{if $photoDate}
+		<br/>
+    	{$photoDate}
+    {/if}
     </p>
 	{include file="findInclude:common/templates/share.tpl" shareURL={$storyURL} shareRemark={$shareRemark} shareEmailURL={$shareEmailURL}}
 </div>
diff --git a/lib/DataResponse/HTTPDataResponse.php b/lib/DataResponse/HTTPDataResponse.php
index 94e2c89cf..f8e9d0403 100644
--- a/lib/DataResponse/HTTPDataResponse.php
+++ b/lib/DataResponse/HTTPDataResponse.php
@@ -48,7 +48,7 @@ protected function parseHTTPResponseHeaders($http_response_header) {
             }
         }
         
-        if (!$this->responseCode) { 
+        if (!$this->responseCode && substr($this->requestURL,0,4) === "http") { 
             $this->responseError = 'Error Retrieving Data';
         }
     }
diff --git a/lib/DateTime/DateFormatter.php b/lib/DateTime/DateFormatter.php
index 7e835b7fd..45502d093 100644
--- a/lib/DateTime/DateFormatter.php
+++ b/lib/DateTime/DateFormatter.php
@@ -57,6 +57,9 @@ public static function formatDate($date, $dateStyle, $timeStyle) {
     }
 
     private static function getTimeConstant($timeStyle) {
+        if (!is_numeric($timeStyle)) {
+            return $timeStyle;
+        }
         switch ($timeStyle)
         {
             case self::NO_STYLE:
@@ -73,6 +76,9 @@ private static function getTimeConstant($timeStyle) {
     }
     
     private static function getDateConstant($dateStyle) {
+        if (!is_numeric($dateStyle)) {
+            return $dateStyle;
+        }
         switch ($dateStyle)
         {
             case self::NO_STYLE:
diff --git a/lib/Maps/GoogleJSMap.php b/lib/Maps/GoogleJSMap.php
index 5145d7643..efaeecf53 100644
--- a/lib/Maps/GoogleJSMap.php
+++ b/lib/Maps/GoogleJSMap.php
@@ -184,7 +184,7 @@ private function getPathJS()
                 $coord = $this->mapProjector->projectPoint($coord);
             }
             $template->appendValues(array(
-                '___ID___' => $marker->getId(),
+                '___ID___' => $placemark->getId(),
                 '___LATITUDE___' => $coord['lat'],
                 '___LONGITUDE___' => $coord['lon'],
                 '___PATHSTRING___' => $coordString,