diff --git a/web/includes/Event.php b/web/includes/Event.php
index 5199338df..0aed91ce5 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -1,6 +1,4 @@
 <?php
-require_once( 'database.php' );
-require_once( 'Storage.php' );
 
 class Event {
   public function __construct( $IdOrRow ) {
@@ -9,7 +7,7 @@ class Event {
       if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
         $row = dbFetchOne( 'SELECT *,unix_timestamp(StartTime) as Time FROM Events WHERE Id=?', NULL, array( $IdOrRow ) );
         if ( ! $row ) {
-          Error("Unable to load Event record for Id=" . $IdOrRow );
+          Error('Unable to load Event record for Id=' . $IdOrRow );
         }
       } elseif ( is_array( $IdOrRow ) ) {
         $row = $IdOrRow;
@@ -28,7 +26,7 @@ class Event {
         $this->{$k} = $v;
       }
     } else {
-      Error("No row for Event " . $IdOrRow );
+      Error('No row for Event ' . $IdOrRow );
     }
   } // end function __construct
   public function Storage() {
@@ -57,34 +55,22 @@ class Event {
     return $Storage->Path().'/'.$this->Relative_Path();
   }
   public function Relative_Path() {
-    $event_path = "";
+    $event_path = '';
 
-    if ( ZM_USE_DEEP_STORAGE )
-    {
-      $event_path = 
-        $this->{'MonitorId'}
-      .'/'.strftime( "%y/%m/%d/%H/%M/%S",
-          $this->Time()
-          )
-        ;
-    }
-    else
-    {
-      $event_path = 
-        $this->{'MonitorId'}
-      .'/'.$this->{'Id'}
-      ;
+    if ( ZM_USE_DEEP_STORAGE ) {
+      $event_path = $this->{'MonitorId'} .'/'.strftime( '%y/%m/%d/%H/%M/%S', $this->Time()) ;
+    } else {
+      $event_path = $this->{'MonitorId'} .'/'.$this->{'Id'};
     }
 
     return( $event_path );
-
-  }
+  } // end function Relative_Path()
 
   public function Link_Path() {
     if ( ZM_USE_DEEP_STORAGE ) {
-      return $this->{'MonitorId'} .'/'.strftime( "%y/%m/%d/.", $this->Time()).$this->{'Id'};
+      return $this->{'MonitorId'} .'/'.strftime( '%y/%m/%d/.', $this->Time()).$this->{'Id'};
     }
-    Error("Calling Link_Path when not using deep storage");
+    Error('Calling Link_Path when not using deep storage');
     return '';
   }
 
@@ -99,19 +85,20 @@ class Event {
 # Assumption: All events haev a start time
         $start_date = date_parse( $this->{'StartTime'} );
         if ( ! $start_date ) {
-          Error("Unable to parse start time for event " . $this->{'Id'} . ' not deleting files.' );
+          Error('Unable to parse start time for event ' . $this->{'Id'} . ' not deleting files.' );
           return;
         }
         $start_date['year'] = $start_date['year'] % 100;
 
-        $Storage = $this->Storage();
 # So this is  because ZM creates a link under teh day pointing to the time that the event happened. 
-        if ( ! $this->Link_Path() ) {
-          Error("Unable to determine link path for event " . $this->{'Id'} . ' not deleting files.' );
+        $link_path = $this->Link_Path();
+        if ( ! $link_path ) {
+          Error('Unable to determine link path for event ' . $this->{'Id'} . ' not deleting files.' );
           return;
         }
         
-        $eventlink_path = $Storage->Path().'/'.$this->Link_Path();
+        $Storage = $this->Storage();
+        $eventlink_path = $Storage->Path().'/'.$link_path;
 
         if ( $id_files = glob( $eventlink_path ) ) {
           if ( ! $eventPath = readlink($id_files[0]) ) {
@@ -144,27 +131,27 @@ class Event {
 
     $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
 
-    $args[] = "source=event&event=".$this->{'Id'};
+    $args[] = 'source=event&event='.$this->{'Id'};
 
     if ( ZM_OPT_USE_AUTH ) {
-      if ( ZM_AUTH_RELAY == "hashed" ) {
-        $args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS );
-      } elseif ( ZM_AUTH_RELAY == "plain" ) {
-        $args[] = "user=".$_SESSION['username'];
-        $args[] = "pass=".$_SESSION['password'];
+      if ( ZM_AUTH_RELAY == 'hashed' ) {
+        $args[] = 'auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
+      } elseif ( ZM_AUTH_RELAY == 'plain' ) {
+        $args[] = 'user='.$_SESSION['username'];
+        $args[] = 'pass='.$_SESSION['password'];
       } elseif ( ZM_AUTH_RELAY == "none" ) {
-        $args[] = "user=".$_SESSION['username'];
+        $args[] = 'user='.$_SESSION['username'];
       }
     }
-    if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) ) {
-      $args[] = "connkey=".$GLOBALS['connkey'];
+    if ( !in_array( 'mode=single', $args ) && !empty($GLOBALS['connkey']) ) {
+      $args[] = 'connkey='.$GLOBALS['connkey'];
     }
     if ( ZM_RAND_STREAM ) {
-      $args[] = "rand=".time();
+      $args[] = 'rand='.time();
     }
 
     if ( count($args) ) {
-      $streamSrc .= "?".join( $querySep, $args );
+      $streamSrc .= '?'.join( $querySep, $args );
     }
 
     return( $streamSrc );
@@ -175,136 +162,147 @@ class Event {
   }
 
   function createListThumbnail( $overwrite=false ) {
-# Load the frame with the highest score to use as a thumbnail
-  if ( !($frame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1", NULL, array( $this->{'Id'}, $this->{'MaxScore'} ) )) )
-    return( false );
+  # Load the frame with the highest score to use as a thumbnail
+    if ( !($frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1', NULL, array( $this->{'Id'}, $this->{'MaxScore'} ) )) ) {
+      Error("Unable to find a Frame matching max score " . $this->{'MaxScore'} . ' for event ' . $this->{'Id'} );
+      // FIXME: What if somehow the db frame was lost or score was changed?  Should probably try another search for any frame.
+      return( false );
+    }
 
-  $frameId = $frame['FrameId'];
+    $frameId = $frame['FrameId'];
 
-  if ( ZM_WEB_LIST_THUMB_WIDTH ) {
-    $thumbWidth = ZM_WEB_LIST_THUMB_WIDTH;
-    $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$this->{'Width'};
-    $thumbHeight = reScale( $this->{'Height'}, $scale );
-  } elseif ( ZM_WEB_LIST_THUMB_HEIGHT ) {
-    $thumbHeight = ZM_WEB_LIST_THUMB_HEIGHT;
-    $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_HEIGHT)/$this->{'Height'};
-    $thumbWidth = reScale( $this->{'Width'}, $scale );
-  } else {
-    Fatal( "No thumbnail width or height specified, please check in Options->Web" );
-  }
+    if ( ZM_WEB_LIST_THUMB_WIDTH ) {
+      $thumbWidth = ZM_WEB_LIST_THUMB_WIDTH;
+      $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$this->{'Width'};
+      $thumbHeight = reScale( $this->{'Height'}, $scale );
+    } elseif ( ZM_WEB_LIST_THUMB_HEIGHT ) {
+      $thumbHeight = ZM_WEB_LIST_THUMB_HEIGHT;
+      $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_HEIGHT)/$this->{'Height'};
+      $thumbWidth = reScale( $this->{'Width'}, $scale );
+    } else {
+      Fatal( "No thumbnail width or height specified, please check in Options->Web" );
+    }
 
-  $imageData = $this->getImageSrc( $frame, $scale, false, $overwrite );
-  if ( ! $imageData ) {
-    return ( false );
-  }
-  $thumbData = $frame;
-  $thumbData['Path'] = $imageData['thumbPath'];
-  $thumbData['Width'] = (int)$thumbWidth;
-  $thumbData['Height'] = (int)$thumbHeight;
+    $imageData = $this->getImageSrc( $frame, $scale, false, $overwrite );
+    if ( ! $imageData ) {
+      return ( false );
+    }
+    $thumbData = $frame;
+    $thumbData['Path'] = $imageData['thumbPath'];
+    $thumbData['Width'] = (int)$thumbWidth;
+    $thumbData['Height'] = (int)$thumbHeight;
 
-  return( $thumbData );
-}
-function getImageSrc( $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) {
-  $Storage = new Storage( $this->{'StorageId'} );
-  $Event = $this;
-  $eventPath = $Event->Path();
+    return( $thumbData );
+  } // end function createListThumbnail
 
-  if ( !is_array($frame) )
-    $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
+  function getImageSrc( $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) {
+    $Storage = new Storage( $this->{'StorageId'} );
+    $Event = $this;
+    $eventPath = $Event->Path();
 
-  if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
-    $captImage = "snapshot.jpg";
-  } else {
-    $captImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
-    if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
-# Generate the frame JPG
-      if ( $Event->DefaultVideo() ) {
-        $command ='ffmpeg -v 0 -i '.$eventPath.'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage;
-        Debug( "Running $command" );
-        $output = array();
-        $retval = 0;
-        exec( $command, $output, $retval );
-        Debug("Retval: $retval, output: " . implode("\n", $output));
-      } else {
-        Error("Can't create frame images from video becuase there is no video file for this event (".$Event->DefaultVideo() );
+    if ( !is_array($frame) )
+      $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
+
+    if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
+      $captImage = "snapshot.jpg";
+    } else {
+      $captImage = sprintf( '%0'.ZM_EVENT_IMAGE_DIGITS.'d-capture.jpg', $frame['FrameId'] );
+      if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
+  # Generate the frame JPG
+        if ( $Event->DefaultVideo() ) {
+          $videoPath = $eventPath.'/'.$Event->DefaultVideo();
+
+          if ( ! file_exists( $videoPath ) ) {
+            Error("Event claims to have a video file, but it does not seem to exist at $videoPath" );
+            return '';
+          } 
+            
+          $command ='ffmpeg -v 0 -i '.$videoPath.' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage;
+          Debug( "Running $command" );
+          $output = array();
+          $retval = 0;
+          exec( $command, $output, $retval );
+          Debug("Retval: $retval, output: " . implode("\n", $output));
+        } else {
+          Error("Can't create frame images from video becuase there is no video file for this event (".$Event->DefaultVideo() );
+        }
       }
     }
-  }
 
-  $captPath = $eventPath.'/'.$captImage;
-  if ( ! file_exists( $captPath ) ) {
-    Error( "Capture file does not exist at $captPath" );
-    return '';
-  }
-  $thumbCaptPath = ZM_DIR_IMAGES.'/'.$this->{'Id'}.'-'.$captImage;
-  
-  //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
+    $captPath = $eventPath.'/'.$captImage;
+    if ( ! file_exists( $captPath ) ) {
+      Error( "Capture file does not exist at $captPath" );
+      return '';
+    }
+    $thumbCaptPath = ZM_DIR_IMAGES.'/'.$this->{'Id'}.'-'.$captImage;
+    
+    //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
 
-  $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
-  $analPath = $eventPath.'/'.$analImage;
+    $analImage = sprintf( '%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $frame['FrameId'] );
+    $analPath = $eventPath.'/'.$analImage;
 
-  $thumbAnalPath = ZM_DIR_IMAGES.'/'.$this->{'Id'}.'-'.$analImage;
-  //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
+    $thumbAnalPath = ZM_DIR_IMAGES.'/'.$this->{'Id'}.'-'.$analImage;
+    //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
 
-  $alarmFrame = $frame['Type']=='Alarm';
+    $alarmFrame = $frame['Type']=='Alarm';
 
-  $hasAnalImage = $alarmFrame && file_exists( $analPath ) && filesize( $analPath );
-  $isAnalImage = $hasAnalImage && !$captureOnly;
+    $hasAnalImage = $alarmFrame && file_exists( $analPath ) && filesize( $analPath );
+    $isAnalImage = $hasAnalImage && !$captureOnly;
 
-  if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) ) {
-    $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
-    $imageFile = $imagePath;
-    $thumbFile = $thumbPath;
-  } else {
-    if ( version_compare( phpversion(), "4.3.10", ">=") )
-      $fraction = sprintf( "%.3F", $scale/SCALE_BASE );
-    else
-      $fraction = sprintf( "%.3f", $scale/SCALE_BASE );
-    $scale = (int)round( $scale );
-
-    $thumbCaptPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbCaptPath );
-    $thumbAnalPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbAnalPath );
-
-    if ( $isAnalImage ) {
-      $imagePath = $analPath;
-      $thumbPath = $thumbAnalPath;
+    if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) ) {
+      $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
+      $imageFile = $imagePath;
+      $thumbFile = $thumbPath;
     } else {
-      $imagePath = $captPath;
-      $thumbPath = $thumbCaptPath;
+      if ( version_compare( phpversion(), '4.3.10', '>=') )
+        $fraction = sprintf( '%.3F', $scale/SCALE_BASE );
+      else
+        $fraction = sprintf( '%.3f', $scale/SCALE_BASE );
+      $scale = (int)round( $scale );
+
+      $thumbCaptPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $thumbCaptPath );
+      $thumbAnalPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $thumbAnalPath );
+
+      if ( $isAnalImage ) {
+        $imagePath = $analPath;
+        $thumbPath = $thumbAnalPath;
+      } else {
+        $imagePath = $captPath;
+        $thumbPath = $thumbCaptPath;
+      }
+
+      $thumbFile = $thumbPath;
+      if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
+      {
+        // Get new dimensions
+        list( $imageWidth, $imageHeight ) = getimagesize( $imagePath );
+        $thumbWidth = $imageWidth * $fraction;
+        $thumbHeight = $imageHeight * $fraction;
+
+        // Resample
+        $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
+        $image = imagecreatefromjpeg( $imagePath );
+        imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
+
+        if ( !imagejpeg( $thumbImage, $thumbPath ) )
+          Error( "Can't create thumbnail '$thumbPath'" );
+      }
     }
 
-    $thumbFile = $thumbPath;
-    if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
-    {
-      // Get new dimensions
-      list( $imageWidth, $imageHeight ) = getimagesize( $imagePath );
-      $thumbWidth = $imageWidth * $fraction;
-      $thumbHeight = $imageHeight * $fraction;
+    $imageData = array(
+        'eventPath' => $eventPath,
+        'imagePath' => $imagePath,
+        'thumbPath' => $thumbPath,
+        'imageFile' => $imagePath,
+        'thumbFile' => $thumbFile,
+        'imageClass' => $alarmFrame?"alarm":"normal",
+        'isAnalImage' => $isAnalImage,
+        'hasAnalImage' => $hasAnalImage,
+        );
 
-      // Resample
-      $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
-      $image = imagecreatefromjpeg( $imagePath );
-      imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
-
-      if ( !imagejpeg( $thumbImage, $thumbPath ) )
-        Error( "Can't create thumbnail '$thumbPath'" );
-    }
+    return( $imageData );
   }
 
-  $imageData = array(
-      'eventPath' => $eventPath,
-      'imagePath' => $imagePath,
-      'thumbPath' => $thumbPath,
-      'imageFile' => $imagePath,
-      'thumbFile' => $thumbFile,
-      'imageClass' => $alarmFrame?"alarm":"normal",
-      'isAnalImage' => $isAnalImage,
-      'hasAnalImage' => $hasAnalImage,
-      );
-
-  return( $imageData );
-}
-
 } # end class
 
 ?>