diff --git a/.travis.yml b/.travis.yml
index 08e086955..916cd5a98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ env:
   - OS=el DIST=7
   - OS=fedora DIST=25
   - OS=fedora DIST=26 DOCKER_REPO=knnniggett/packpack
+  - OS=fedora DIST=27 DOCKER_REPO=knnniggett/packpack
   - OS=ubuntu DIST=trusty
   - OS=ubuntu DIST=xenial
   - OS=ubuntu DIST=trusty ARCH=i386
diff --git a/README.md b/README.md
index 4c318b659..1d43ff560 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,8 @@ This is the recommended method to install ZoneMinder onto your system. ZoneMinde
 - Fedora via [RPM Fusion](http://rpmfusion.org)
 - OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
 - Mageia from their default repository
+- Arch via the [AUR](https://aur.archlinux.org/packages/zoneminder/)
+- Gentoo from their [default repository](https://packages.gentoo.org/packages/www-misc/zoneminder)
 
 If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
 
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index a4802ef98..91089ff2d 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -195,6 +195,7 @@ CREATE TABLE `Events` (
   `Frames` int(10) unsigned default NULL,
   `AlarmFrames` int(10) unsigned default NULL,
   `DefaultVideo` VARCHAR( 64 ) DEFAULT '' NOT NULL,
+  `SaveJPEGs` TINYINT,
   `TotScore` int(10) unsigned NOT NULL default '0',
   `AvgScore` smallint(5) unsigned default '0',
   `MaxScore` smallint(5) unsigned default '0',
@@ -384,6 +385,8 @@ CREATE TABLE `Monitors` (
   `Deinterlacing` int(10) unsigned NOT NULL default '0',
   `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
   `VideoWriter` TINYINT NOT NULL DEFAULT '0',
+  `OutputCodec`     enum('h264','mjpeg','mpeg1','mpeg2'),
+  `OutputContainer` enum('auto','mp4','mkv'),
   `EncoderParameters` TEXT,
   `RecordAudio` TINYINT NOT NULL DEFAULT '0',
   `RTSPDescribe` tinyint(1) unsigned,
@@ -428,9 +431,9 @@ CREATE TABLE `Monitors` (
   `WebColour` varchar(32) NOT NULL default 'red',
   `Exif` tinyint(1) unsigned NOT NULL default '0',
   `Sequence` smallint(5) unsigned default NULL,
-`Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown',
-`zmcFPS`  DECIMAL(5,2) NOT NULL default 0,
-`zmaFPS` DECIMAL(5,2) NOT NULL default 0,
+  `Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown',
+  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
+  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
@@ -606,13 +609,14 @@ CREATE TABLE `Storage` (
 	`Path`	varchar(64)	NOT NULL default '',
 	`Name`	varchar(64) NOT NULL default '',
 	`Type`	enum('local','s3fs') NOT NULL default 'local',
+  `DiskSpace`   bigint unsigned default NULL,
 	PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 --
 -- Create a default storage location
 --
-insert into Storage VALUES (NULL, '/var/cache/zoneminder/events', 'Default', 'local' );
+insert into Storage VALUES (NULL, '/var/cache/zoneminder/events', 'Default', 'local', NULL );
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
diff --git a/db/zm_update-1.31.11.sql b/db/zm_update-1.31.11.sql
index de17d85d9..e0772cef4 100644
--- a/db/zm_update-1.31.11.sql
+++ b/db/zm_update-1.31.11.sql
@@ -67,3 +67,4 @@ SET @s = (SELECT IF(
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
+
diff --git a/db/zm_update-1.31.13.sql b/db/zm_update-1.31.13.sql
new file mode 100644
index 000000000..dd63b347a
--- /dev/null
+++ b/db/zm_update-1.31.13.sql
@@ -0,0 +1,26 @@
+ALTER TABLE `Monitors` MODIFY `OutputCodec` enum('h264','mjpeg','mpeg1','mpeg2') default 'h264';
+ALTER TABLE `Monitors` MODIFY `OutputContainer` enum('auto','mp4','mkv') default 'auto';
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Events'
+     AND column_name = 'SaveJPEGs'
+    ) > 0,
+"SELECT 'Column SaveJPEGs already exists in Events'",
+"ALTER TABLE `Events` ADD `SaveJPEGs` TINYINT AFTER `DefaultVideo`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Storage'
+     AND column_name = 'DiskSpace'
+    ) > 0,
+"SELECT 'Column DiskSpace already exists in Events'",
+"ALTER TABLE `Storage` ADD `DiskSpace`   bigint unsigned default NULL AFTER `Type`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.31.2.sql b/db/zm_update-1.31.2.sql
index c94e3302a..9761987d1 100644
--- a/db/zm_update-1.31.2.sql
+++ b/db/zm_update-1.31.2.sql
@@ -16,3 +16,5 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
+INSERT INTO `Controls` VALUES (28,'Floureon 1080P','Ffmpeg','Floureon',0,0,0,1,0,0,0,1,1,18,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
+
diff --git a/distros/ubuntu1604/rules b/distros/ubuntu1604/rules
index 5cf153266..53a9a237a 100755
--- a/distros/ubuntu1604/rules
+++ b/distros/ubuntu1604/rules
@@ -27,9 +27,7 @@ override_dh_auto_configure:
             -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
             -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
             -DZM_DIR_IMAGES="/var/cache/zoneminder/images"    \
-            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               \
-            -DZM_NO_CURL=1 \
-            -DZM_NO_LIBVLC=1 
+            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"
 
 override_dh_clean:
 	dh_clean $(MANPAGES1)
diff --git a/distros/ubuntu1604/zoneminder.postinst b/distros/ubuntu1604/zoneminder.postinst
index e06cdd3b5..dedbf7096 100644
--- a/distros/ubuntu1604/zoneminder.postinst
+++ b/distros/ubuntu1604/zoneminder.postinst
@@ -17,23 +17,16 @@ if [ "$1" = "configure" ]; then
     a2enmod cgi
   fi
 
-	# Do this every time the package is installed or upgraded
   # Ensure zoneminder is stopped
-  deb-systemd-invoke stop zoneminder.service || exit $?
-
-  # Ensure zoneminder is stopped
-  deb-systemd-invoke stop zoneminder.service || exit $?
-	if [ "$ZM_DB_HOST" = "localhost" ]; then
 
     if [ -e "/etc/init.d/mysql" ]; then
+      # Do this every time the package is installed or upgraded
+      # Ensure zoneminder is stopped
+      deb-systemd-invoke stop zoneminder.service || exit $?
 
       #
       # Get mysql started if it isn't
       #
-      if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
-          deb-systemd-invoke start mysql.service || exit $?
-      fi
-
       if $(/etc/init.d/mysql status >/dev/null 2>&1); then
         mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
         # test if database if already present...
diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index e561e7477..fe95754d1 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -15,9 +15,11 @@ achieve the same result by running:
 
 ::
 
-    tasksel install lamp-server
+    sudo tasksel install lamp-server
 
 During installation it will ask you to set up a master/root password for the MySQL.
+Installing LAMP is not ZoneMinder specific so you will find plenty of resources to 
+guide you with a quick search.
 
 **Step 1:** Either run commands in this install using sudo or use the below to become root
 ::
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index d2b444ef4..f69e95b18 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -115,7 +115,7 @@ BEGIN {
       , $Config{ZM_DB_USER}
       , $Config{ZM_DB_PASS}
       ) or croak( "Can't connect to db" );
-  my $sql = 'select * from Config';
+  my $sql = 'SELECT Name,Value FROM Config';
   my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
   my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
   while( my $config = $sth->fetchrow_hashref() ) {
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Floureon.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Floureon.pm
new file mode 100644
index 000000000..bb3504067
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Floureon.pm
@@ -0,0 +1,390 @@
+# Modified on 2017-11-17 by Ognyan Bankov 
+
+# ==========================================================================
+#
+# ZoneMinder Floureon 1080p IP Control Protocol Module, $Date: 2017-11-17 09:20:00 +0000 $, $Revision: 0001 $
+# Copyright (C) 2017 Ognyan Bankov
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the Floureon 1080p 18x (Model: BT-HD54F)  IP camera control
+# protocol. It should work with other Floureon cameras too.
+#
+# 
+
+package MyAgent;
+
+use base 'LWP::UserAgent';
+
+
+package ZoneMinder::Control::Floureon;
+ 
+use 5.006;
+use strict;
+use warnings;
+ 
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+ 
+our @ISA = qw(ZoneMinder::Control);
+ 
+our $VERSION = $ZoneMinder::Base::VERSION;
+ 
+# ==========================================================================
+#
+# Floureon IP Control Protocol
+#
+# ==========================================================================
+ 
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+ 
+use Time::HiRes qw( usleep );
+ 
+sub new
+{
+	my $class = shift;
+	my $id = shift;
+	my $self = ZoneMinder::Control->new( $id );
+	my $logindetails = "";
+	bless( $self, $class );
+	srand( time() );
+	return $self;
+}
+ 
+our $AUTOLOAD;
+ 
+sub AUTOLOAD
+{
+	my $self = shift;
+	my $class = ref($self) || croak( "$self not object" );
+	my $name = $AUTOLOAD;
+	$name =~ s/.*://;
+	if ( exists($self->{$name}) )
+	{
+		return( $self->{$name} );
+	}
+	Fatal( "Can't access $name member of object of class $class" );
+}
+our $stop_command;
+ 
+sub open
+{
+	my $self = shift;
+ 
+	$self->loadMonitor();
+ 
+	$self->{ua} = MyAgent->new;
+	$self->{ua}->agent( "ZoneMinder Control Agent/" );
+ 
+	$self->{state} = 'open';
+}
+ 
+sub close
+{
+	my $self = shift;
+	$self->{state} = 'closed';
+}
+ 
+sub printMsg
+{
+	my $self = shift;
+	my $msg = shift;
+	my $msg_len = length($msg);
+ 
+	Debug( $msg."[".$msg_len."]" );
+}
+ 
+sub sendCmd
+{
+	my $self = shift;
+	my $cmd = shift;
+	my $result = undef;
+	printMsg( $cmd, "Tx" );
+ 
+	my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd"."&".$self->{Monitor}->{ControlDevice});
+	print ("Sending $req\n");
+	my $res = $self->{ua}->request($req);
+	if ( $res->is_success )
+	{
+		$result = !undef;
+	}
+	else
+	{
+		Error( "Error REALLY check failed:'".$res->status_line()."'" );
+		Error ("Cmd:".$req);
+	}
+ 
+	return( $result );
+}
+ 
+sub reset
+{
+	my $self = shift;
+	Debug( "Camera Reset" );
+	my $cmd = "reboot.cgi?";
+	$self->sendCmd( $cmd );
+}
+
+# PP - in all move operations, added auto stop after timeout
+
+#Up Arrow
+sub moveConUp
+{
+	my $self = shift;
+	my $params = shift;
+	my $tiltspeed = $self->getParam( $params, 'tiltspeed' );
+	Debug( "Move Up" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=1&PanSpeed=6&TiltSpeed=$tiltspeed";
+	$self->sendCmd( $cmd );
+	$self->autoStop($tiltspeed);
+}
+ 
+#Down Arrow
+sub moveConDown
+{
+	my $self = shift;
+	my $params = shift;
+	my $tiltspeed = $self->getParam( $params, 'tiltspeed' );
+	Debug( "Move Down" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=2&PanSpeed=6&TiltSpeed=$tiltspeed";
+	$self->sendCmd( $cmd );
+	$self->autoStop($tiltspeed);
+}
+ 
+#Left Arrow
+sub moveConLeft
+{
+	my $self = shift;
+	my $params = shift;
+	my $panspeed = $self->getParam( $params, 'panspeed' );
+	
+	Debug( "Move Left" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=3&PanSpeed=$panspeed&TiltSpeed=6";
+	$self->sendCmd( $cmd );
+	$self->autoStop($panspeed);
+}
+ 
+#Right Arrow
+sub moveConRight
+{
+	my $self = shift;
+	my $params = shift;
+	my $panspeed = $self->getParam( $params, 'panspeed' );
+	Debug( "Move Right" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=4&PanSpeed=$panspeed&TiltSpeed=6";
+	$self->sendCmd( $cmd );
+	$self->autoStop($panspeed);
+}
+ 
+#Diagonally Up Right Arrow
+sub moveConUpRight
+{
+	my $self = shift;
+	my $params = shift;
+	my $panspeed = $self->getParam( $params, 'panspeed' );
+	my $tiltspeed = $self->getParam( $params, 'tiltspeed' );
+	Debug( "Move Diagonally Up Right" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=7&PanSpeed=$panspeed&TiltSpeed=$tiltspeed";
+	$self->sendCmd( $cmd );
+	$self->autoStop($tiltspeed);
+
+}
+ 
+#Diagonally Down Right Arrow
+sub moveConDownRight
+{
+	my $self = shift;
+	my $params = shift;
+	my $panspeed = $self->getParam( $params, 'panspeed' );
+	my $tiltspeed = $self->getParam( $params, 'tiltspeed' );
+	Debug( "Move Diagonally Down Right" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=8&PanSpeed=$panspeed&TiltSpeed=$tiltspeed";
+	$self->sendCmd( $cmd );
+	$self->autoStop($tiltspeed);
+}
+ 
+#Diagonally Up Left Arrow
+sub moveConUpLeft
+{
+	my $self = shift;
+	my $params = shift;
+	my $panspeed = $self->getParam( $params, 'panspeed' );
+	my $tiltspeed = $self->getParam( $params, 'tiltspeed' );
+	Debug( "Move Diagonally Up Left" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=5&PanSpeed=$panspeed&TiltSpeed=$tiltspeed";
+	$self->sendCmd( $cmd );
+	$self->autoStop($tiltspeed);
+}
+ 
+#Diagonally Down Left Arrow
+sub moveConDownLeft
+{
+	my $self = shift;
+	my $params = shift;
+	my $panspeed = $self->getParam( $params, 'panspeed' );
+	my $tiltspeed = $self->getParam( $params, 'tiltspeed' );
+	Debug( "Move Diagonally Down Left" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Direction=6&PanSpeed=$panspeed&TiltSpeed=$tiltspeed";
+	$self->sendCmd( $cmd );
+	$self->autoStop($tiltspeed);
+}
+ 
+#Stop
+sub moveStop
+{
+	my $self = shift;
+	Debug( "Move Stop" );
+	my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Stop=0";
+	$self->sendCmd( $cmd );
+}
+
+ 
+sub zoomConTele
+{
+	my $self = shift;
+        my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Zoom=1";
+        $self->sendCmd( $cmd );
+        $self->autoStop();        
+}
+
+
+sub zoomConWide
+{
+	my $self = shift;
+        my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Zoom=0";
+        $self->sendCmd( $cmd );
+        $self->autoStop();
+}
+ 
+
+sub focusConNear
+{
+	my $self = shift;
+        my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Focus=1";
+        $self->sendCmd( $cmd );
+        $self->autoStop();
+} 
+
+
+sub focusConFar
+{
+	my $self = shift;
+        my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Focus=0";
+        $self->sendCmd( $cmd );
+        $self->autoStop();
+}
+
+
+sub irisConOpen
+{
+	my $self = shift;
+        my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Iris=1";
+        $self->sendCmd( $cmd );
+        $self->autoStop();
+} 
+
+
+sub irisConClose
+{
+	my $self = shift;
+        my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Iris=0";
+        $self->sendCmd( $cmd );
+        $self->autoStop();
+} 
+
+
+#Set preset
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&PresetNumber=1&Preset=0";
+    $self->sendCmd( $cmd );
+}
+
+ 
+#Goto preset
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&PresetNumber=1&Preset=1";
+    $self->sendCmd( $cmd );
+}
+
+
+sub autoStop
+{
+	my $self = shift;
+	my $timeout = shift;
+
+	if ($timeout)
+	{
+		if ($timeout > 1) {
+			usleep(100000*$timeout);
+		}
+	}
+        Debug( "Auto Stop" );
+        my $cmd = "cgi/ptz_set?Channel=1&Group=PTZCtrlInfo&Stop=0";
+        $self->sendCmd( $cmd );
+}
+ 
+1;
+__END__
+
+=head1 Floureon
+
+ZoneMinder::Database - Perl extension for Floureon 1080P
+
+=head1 SYNOPSIS
+
+Control script for Floureon 1080P IP camera
+
+=head1 DESCRIPTION
+
+When setuping you monitor in the "Control" tab:
+
+1. Select "Control type": Floureon 1080P
+2. Leave "Control device" empty
+3. Fill "Control Address" like username:password@ip/domain. Example: admin:admin123@192.168.1.110
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+=head1 AUTHOR
+
+Ognyan Bankov, E<lt>ogibankov@gmail.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2017  Ognyan Bankov
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
+
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index 2fc590977..8c4eba093 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -390,7 +390,7 @@ sub age {
 
 sub DiskSpace {
   if ( @_ > 1 ) {
-    Debug("Cleared DiskSpace, was $_[0]{DiskSpace}");
+    Debug("Cleared DiskSpace, was $_[0]{DiskSpace}") if $_[0]{DiskSpace};
     $_[0]{DiskSpace} = $_[1];
   }
   if ( ! defined $_[0]{DiskSpace} ) {
diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index cbb68faff..1593777b4 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -21,34 +21,6 @@
 #
 # ==========================================================================
 
-=head1 NAME
-
-zmaudit.pl - ZoneMinder event file system and database consistency checker
-
-=head1 SYNOPSIS
-
- zmaudit.pl [-r,-report|-i,-interactive]
-
-=head1 DESCRIPTION
-
-This script checks for consistency between the event filesystem and
-the database. If events are found in one and not the other they are
-deleted (optionally). Additionally any monitor event directories that
-do not correspond to a database monitor are similarly disposed of.
-However monitors in the database that don't have a directory are left
-alone as this is valid if they are newly created and have no events
-yet.
-
-=head1 OPTIONS
-
- -c, --continuous           - Run continuously
- -i, --interactive          - Ask before applying any changes
- -m, --monitor_id          - Restrict zmaudit actions to events pertaining to the specified monitor id
- -r, --report               - Just report don't actually do anything
- -v, --version              - Print the installed version of ZoneMinder
-  
-
-=cut
 use strict;
 use bytes;
 
@@ -81,6 +53,7 @@ use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
                            ? $Config{ZM_DIR_EVENTS}
                            : ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
 ;
+use constant ZM_AUDIT_PID => '@ZM_RUNDIR@/zmaudit.pid';
 
 $| = 1;
 
@@ -118,6 +91,17 @@ if ( ! exists $Config{ZM_AUDIT_MIN_AGE} ) {
   Fatal('ZM_AUDIT_MIN_AGE is not set in config.');
 }
 
+if ( -e ZM_AUDIT_PID ) {
+  Fatal('zmaudit.pl appears to already be running.  If not, please delete ' . ZM_AUDIT_PID );
+} else {
+  if ( open( my $PID, '>', ZM_AUDIT_PID ) ) {
+    print( $PID $$ );
+    close( $PID );
+  } else {
+    Error( "Can't open pid file at " . ZM_PID );
+  }
+}
+
 my $dbh = zmDbConnect();
 
 require ZoneMinder::Monitor;
@@ -598,6 +582,7 @@ Debug("Event $db_event is not in fs.");
   sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} ) if $continuous;
 };
 
+unlink ZM_AUDIT_PID;
 exit( 0 );
 
 sub aud_print {
@@ -688,3 +673,30 @@ sub delete_empty_directories {
 
 1;
 __END__
+
+=head1 NAME
+
+zmaudit.pl - ZoneMinder event file system and database consistency checker
+
+=head1 SYNOPSIS
+
+ zmaudit.pl [-r,-report|-i,-interactive]
+
+=head1 DESCRIPTION
+
+This script checks for consistency between the event filesystem and
+the database. If events are found in one and not the other they are
+deleted (optionally). Additionally any monitor event directories that
+do not correspond to a database monitor are similarly disposed of.
+However monitors in the database that don't have a directory are left
+alone as this is valid if they are newly created and have no events
+yet.
+
+=head1 OPTIONS
+
+ -c, --continuous           - Run continuously
+ -i, --interactive          - Ask before applying any changes
+ -r, --report               - Just report don't actually do anything
+ -v, --version              - Print the installed version of ZoneMinder
+
+=cut
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 597d7ac1a..bc57430f4 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -21,20 +21,6 @@
 #
 # ==========================================================================
 
-=head1 NAME
-
-zmpkg.pl - ZoneMinder Package Control Script
-
-=head1 SYNOPSIS
-
- zmpkg.pl {start|stop|restart|status|logrot|'state'|version}
-
-=head1 DESCRIPTION
-
-This script is used to start and stop the ZoneMinder package primarily to
-allow command line control for automatic restart on reboot (see zm script)
-
-=cut
 use strict;
 use bytes;
 
@@ -61,48 +47,41 @@ logInit();
 
 my $command = $ARGV[0]||'';
 if ( $command eq 'version' ) {
-    print ZoneMinder::Base::ZM_VERSION . "\n";
-    exit(0);
+  print ZoneMinder::Base::ZM_VERSION . "\n";
+  exit(0);
 }
 
 my $state;
 
 my $dbh;
 
-if ( !$command || $command !~ /^(?:start|stop|restart|status|logrot|version)$/ )
-{
-    if ( $command )
-    {
-        $dbh = zmDbConnect();
-        # Check to see if it's a valid run state
-        my $sql = 'select * from States where Name = ?';
-        my $sth = $dbh->prepare_cached( $sql )
-            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $command )
-            or Fatal( "Can't execute: ".$sth->errstr() );
-        if ( $state = $sth->fetchrow_hashref() )
-        {
-            $state->{Name} = $command;
-            $state->{Definitions} = [];
-            foreach( split( /,/, $state->{Definition} ) )
-            {
-                my ( $id, $function, $enabled ) = split( /:/, $_ );
-                push( @{$state->{Definitions}},
-                      { Id=>$id, Function=>$function, Enabled=>$enabled }
-                );
-            }
- 	    $store_state=$command; # PP - Remember the name that was passed to search in DB
-            $command = 'state';
-        }
-        else
-        {
-            $command = undef;
-        }
-    }
-    if ( !$command )
-    {
-        pod2usage(-exitstatus => -1);
+if ( !$command || $command !~ /^(?:start|stop|restart|status|logrot|version)$/ ) {
+  if ( $command ) {
+    $dbh = zmDbConnect();
+# Check to see if it's a valid run state
+    my $sql = 'SELECT * FROM States WHERE Name=?';
+    my $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $command )
+      or Fatal( "Can't execute: ".$sth->errstr() );
+    if ( $state = $sth->fetchrow_hashref() ) {
+      $state->{Name} = $command;
+      $state->{Definitions} = [];
+      foreach( split( /,/, $state->{Definition} ) ) {
+        my ( $id, $function, $enabled ) = split( /:/, $_ );
+        push( @{$state->{Definitions}},
+            { Id=>$id, Function=>$function, Enabled=>$enabled }
+            );
+      }
+      $store_state=$command; # PP - Remember the name that was passed to search in DB
+        $command = 'state';
+    } else {
+      $command = undef;
     }
+  }
+  if ( !$command ) {
+    pod2usage(-exitstatus => -1);
+  }
 }
 $dbh = zmDbConnect() if ! $dbh;
 # PP - Sane state check
@@ -110,324 +89,297 @@ isActiveSanityCheck();
 
 # Move to the right place
 chdir( $Config{ZM_PATH_WEB} )
-    or Fatal( "Can't chdir to '".$Config{ZM_PATH_WEB}."': $!" );
+  or Fatal( "Can't chdir to '".$Config{ZM_PATH_WEB}."': $!" );
 
-my $dbg_id = "";
+  my $dbg_id = '';
 
-Info( "Command: $command\n" );
+  Info( "Command: $command\n" );
 
-my $retval = 0;
+  my $retval = 0;
 
-if ( $command eq "state" )
-{
+  if ( $command eq 'state' ) {
     Info( "Updating DB: $state->{Name}\n" );
     my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=? ORDER BY Id ASC' : 'SELECT * FROM Monitors ORDER BY Id ASC';
     my $sth = $dbh->prepare_cached( $sql )
-        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID}: () )
-        or Fatal( "Can't execute: ".$sth->errstr() );
-    while( my $monitor = $sth->fetchrow_hashref() )
-    {
-        foreach my $definition ( @{$state->{Definitions}} )
-        {
-            if ( $monitor->{Id} =~ /^$definition->{Id}$/ )
-            {
-                $monitor->{NewFunction} = $definition->{Function};
-                $monitor->{NewEnabled} = $definition->{Enabled};
-            }
-        }
-        #next if ( !$monitor->{NewFunction} );
-        $monitor->{NewFunction} = 'None'
-            if ( !$monitor->{NewFunction} );
-        $monitor->{NewEnabled} = 0
-            if ( !$monitor->{NewEnabled} );
-        if ( $monitor->{Function} ne $monitor->{NewFunction}
-             || $monitor->{Enabled} ne $monitor->{NewEnabled}
-        )
-        {
-            my $sql = "update Monitors set Function = ?, Enabled = ? where Id = ?";
-            my $sth = $dbh->prepare_cached( $sql )
-                or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-            my $res = $sth->execute( $monitor->{NewFunction}, $monitor->{NewEnabled}, $monitor->{Id} )
-                or Fatal( "Can't execute: ".$sth->errstr() );
+      or Fatal( "Can't execute: ".$sth->errstr() );
+    while( my $monitor = $sth->fetchrow_hashref() ) {
+      foreach my $definition ( @{$state->{Definitions}} ) {
+        if ( $monitor->{Id} =~ /^$definition->{Id}$/ ) {
+          $monitor->{NewFunction} = $definition->{Function};
+          $monitor->{NewEnabled} = $definition->{Enabled};
         }
+      }
+#next if ( !$monitor->{NewFunction} );
+      $monitor->{NewFunction} = 'None'
+        if ( !$monitor->{NewFunction} );
+      $monitor->{NewEnabled} = 0
+        if ( !$monitor->{NewEnabled} );
+      if ( $monitor->{Function} ne $monitor->{NewFunction}
+          || $monitor->{Enabled} ne $monitor->{NewEnabled}
+         ) {
+        my $sql = 'UPDATE Monitors SET Function=?, Enabled=? WHERE Id=?';
+        my $sth = $dbh->prepare_cached( $sql )
+          or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $monitor->{NewFunction}, $monitor->{NewEnabled}, $monitor->{Id} )
+          or Fatal( "Can't execute: ".$sth->errstr() );
+      }
     }
     $sth->finish();
-      
-    # PP - Now mark a specific state as active
+
+# PP - Now mark a specific state as active
     resetStates();
     Info ("Marking $store_state as Enabled");
-    $sql = "update States set IsActive = '1' where Name = ?";
+    $sql = "UPDATE States SET IsActive = '1' WHERE Name = ?";
     $sth = $dbh->prepare_cached( $sql )
-         or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
     $res = $sth->execute( $store_state )
-         or Fatal( "Can't execute: ".$sth->errstr() );
+      or Fatal( "Can't execute: ".$sth->errstr() );
 
-    # PP - zero out other states isActive
-    $command = "restart";
-}
+# PP - zero out other states isActive
+    $command = 'restart';
+  }
 
 # Check if we are running systemd and if we have been called by the system
-if ( $command =~ /^(start|stop|restart)$/ )
-{
-    # We have to detaint to keep perl from complaining
-    $command = $1;
+if ( $command =~ /^(start|stop|restart)$/ ) {
+# We have to detaint to keep perl from complaining
+  $command = $1;
 
-
-    if ( systemdRunning() && !calledBysystem() ) {
-        qx(@BINDIR@/zmsystemctl.pl $command);
-        $command = "";
-    }
+  if ( systemdRunning() && !calledBysystem() ) {
+    qx(@BINDIR@/zmsystemctl.pl $command);
+    $command = '';
+  }
 }
 
-if ( $command =~ /^(?:stop|restart)$/ )
-{
-    my $status = runCommand( "zmdc.pl check" );
+if ( $command =~ /^(?:stop|restart)$/ ) {
+  my $status = runCommand('zmdc.pl check');
 
-    if ( $status eq "running" )
-    {
-        runCommand( "zmdc.pl shutdown" );
-        zmMemTidy();
-    }
-    else
-    {
-        $retval = 1;
-    }
+  if ( $status eq 'running' ) {
+    runCommand('zmdc.pl shutdown');
+    zmMemTidy();
+  } else {
+    $retval = 1;
+  }
 }
 
 #runCommand( "zmupdate.pl -f" );
 
-if ( $command =~ /^(?:start|restart)$/ )
-{
-    my $status = runCommand( "zmdc.pl check" );
+if ( $command =~ /^(?:start|restart)$/ ) {
+  my $status = runCommand('zmdc.pl check');
 
-    if ( $status eq "stopped" )
-    {
-        if ( $Config{ZM_DYN_DB_VERSION}
-             and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
-        )
-        {
-            Fatal( "Version mismatch, system is version ".ZM_VERSION
-                   .", database is ".$Config{ZM_DYN_DB_VERSION}
-                   .", please run zmupdate.pl to update."
-            );
-            exit( -1 );
-        }
+  if ( $status eq 'stopped' ) {
+    if ( $Config{ZM_DYN_DB_VERSION}
+        and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
+       ) {
+      Fatal( 'Version mismatch, system is version '.ZM_VERSION
+          .', database is '.$Config{ZM_DYN_DB_VERSION}
+          .', please run zmupdate.pl to update.'
+          );
+      exit( -1 );
+    }
 
-        # Recreate the temporary directory if it's been wiped
-        verifyFolder("@ZM_TMPDIR@");
+# Recreate the temporary directory if it's been wiped
+    verifyFolder('@ZM_TMPDIR@');
 
-        # Recreate the run directory if it's been wiped
-        verifyFolder("@ZM_RUNDIR@");
+# Recreate the run directory if it's been wiped
+    verifyFolder('@ZM_RUNDIR@');
 
-        # Recreate the sock directory if it's been wiped
-        verifyFolder("@ZM_SOCKDIR@");
+# Recreate the sock directory if it's been wiped
+    verifyFolder('@ZM_SOCKDIR@');
 
-        zmMemTidy();
-        runCommand( "zmdc.pl startup" );
+    zmMemTidy();
+    runCommand('zmdc.pl startup');
 
-        if ( $Config{ZM_SERVER_ID} ) {
-            Info( "Multi-server configuration detected. Starting up services for server $Config{ZM_SERVER_ID}\n");
+    if ( $Config{ZM_SERVER_ID} ) {
+      Info("Multi-server configuration detected. Starting up services for server $Config{ZM_SERVER_ID}\n");
+    } else {
+      Info('Single server configuration detected. Starting up services.');
+    }
+
+    my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
+    my $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
+      or Fatal( "Can't execute: ".$sth->errstr() );
+    while( my $monitor = $sth->fetchrow_hashref() ) {
+      if ( $monitor->{Function} ne 'None' ) {
+        if ( $monitor->{Type} eq 'Local' ) {
+          runCommand( "zmdc.pl start zmc -d $monitor->{Device}" );
         } else {
-            Info( "Single server configuration detected. Starting up services." );
+          runCommand( "zmdc.pl start zmc -m $monitor->{Id}" );
         }
-
-        my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
-        my $sth = $dbh->prepare_cached( $sql )
-            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
-            or Fatal( "Can't execute: ".$sth->errstr() );
-        while( my $monitor = $sth->fetchrow_hashref() )
-        {
-            if ( $monitor->{Function} ne 'None' )
-            {
-                if ( $monitor->{Type} eq 'Local' )
-                {
-                    runCommand( "zmdc.pl start zmc -d $monitor->{Device}" );
-                }
-                else
-                {
-                    runCommand( "zmdc.pl start zmc -m $monitor->{Id}" );
-                }
-                if ( $monitor->{Function} ne 'Monitor' )
-                {
-                    runCommand( "zmdc.pl start zma -m $monitor->{Id}" );
-                }
-                if ( $Config{ZM_OPT_CONTROL} )
-                {
-                    if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' )
-                    {
-                        if ( $monitor->{Controllable} && $monitor->{TrackMotion} )
-                        {
-                            runCommand( "zmdc.pl start zmtrack.pl -m $monitor->{Id}" );
-                        }
-                    }
-                }
+        if ( $monitor->{Function} ne 'Monitor' ) {
+          runCommand( "zmdc.pl start zma -m $monitor->{Id}" );
+        }
+        if ( $Config{ZM_OPT_CONTROL} ) {
+          if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' ) {
+            if ( $monitor->{Controllable} && $monitor->{TrackMotion} ) {
+              runCommand( "zmdc.pl start zmtrack.pl -m $monitor->{Id}" );
             }
+          }
         }
-        $sth->finish();
+      }
+    }
+    $sth->finish();
 
-        # This is now started unconditionally
-        runCommand( "zmdc.pl start zmfilter.pl" );
-        if ( $Config{ZM_RUN_AUDIT} )
-        {
-            runCommand( "zmdc.pl start zmaudit.pl -c" );
-        }
-        if ( $Config{ZM_OPT_TRIGGERS} )
-        {
-            runCommand( "zmdc.pl start zmtrigger.pl" );
-        }
-        if ( $Config{ZM_OPT_X10} )
-        {
-            runCommand( "zmdc.pl start zmx10.pl -c start" );
-        }
-        runCommand( "zmdc.pl start zmwatch.pl" );
-        if ( $Config{ZM_CHECK_FOR_UPDATES} )
-        {
-            runCommand( "zmdc.pl start zmupdate.pl -c" );
-        }
-        if ( $Config{ZM_TELEMETRY_DATA} )
-        {
-            runCommand( "zmdc.pl start zmtelemetry.pl" );
-        }
+# This is now started unconditionally
+    runCommand('zmdc.pl start zmfilter.pl');
+    if ( $Config{ZM_RUN_AUDIT} ) {
+      runCommand('zmdc.pl start zmaudit.pl -c');
     }
-    else
-    {
-        $retval = 1;
+    if ( $Config{ZM_OPT_TRIGGERS} ) {
+      runCommand('zmdc.pl start zmtrigger.pl');
     }
+    if ( $Config{ZM_OPT_X10} ) {
+      runCommand('zmdc.pl start zmx10.pl -c start');
+    }
+    runCommand('zmdc.pl start zmwatch.pl');
+    if ( $Config{ZM_CHECK_FOR_UPDATES} ) {
+      runCommand('zmdc.pl start zmupdate.pl -c');
+    }
+    if ( $Config{ZM_TELEMETRY_DATA} ) {
+      runCommand('zmdc.pl start zmtelemetry.pl');
+    }
+  } else {
+    $retval = 1;
+  }
 }
 
-if ( $command eq "status" )
-{
-    my $status = runCommand( "zmdc.pl check" );
+if ( $command eq 'status' ) {
+  my $status = runCommand('zmdc.pl check');
 
-    print( STDOUT $status."\n" );
-}
-
-if ( $command eq "logrot" )
-{
-    runCommand( "zmdc.pl logrot" );
+  print( STDOUT $status."\n" );
+} elsif ( $command eq 'logrot' ) {
+  runCommand('zmdc.pl logrot');
 }
 
 exit( $retval );
 
 # PP - Make sure isActive is on and only one
-sub isActiveSanityCheck
-{
+sub isActiveSanityCheck {
 
-	Info ("Sanity checking States table...");
-	$dbh = zmDbConnect() if ! $dbh;
-	
-	# PP - First, make sure default exists and there is only one
-	my $sql = "select Name from States where Name = 'default'";
-        my $sth = $dbh->prepare_cached( $sql )
-                or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute()
-                or Fatal( "Can't execute: ".$sth->errstr() );
+  Info ('Sanity checking States table...');
+  $dbh = zmDbConnect() if ! $dbh;
 
-	if ($sth->rows != 1) # PP - no row, or too many rows. Either case is an error
-	{
-		Info( "Fixing States table - either no default state or duplicate default states" );
-		$sql = "delete from States where Name = 'default'";
-       		$sth = $dbh->prepare_cached( $sql )
-             		or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                $res = $sth->execute()
-               		or Fatal( "Can't execute: ".$sth->errstr() );
-		$sql = "insert into States (Name,Definition,IsActive) VALUES ('default','','1');";
-       		$sth = $dbh->prepare_cached( $sql )
-               		or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                $res = $sth->execute()
-                	or Fatal( "Can't execute: ".$sth->errstr() );
-	}	
+# PP - First, make sure default exists and there is only one
+  my $sql = "SELECT Name FROM States WHERE Name='default'";
+  my $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute()
+    or Fatal( "Can't execute: ".$sth->errstr() );
+
+  if ($sth->rows != 1) {
+# PP - no row, or too many rows. Either case is an error
+    Info( 'Fixing States table - either no default state or duplicate default states' );
+    $sql = "DELETE FROM States WHERE Name='default'";
+    $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    $res = $sth->execute()
+      or Fatal( "Can't execute: ".$sth->errstr() );
+    $sql = "INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');";
+    $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    $res = $sth->execute()
+      or Fatal( "Can't execute: ".$sth->errstr() );
+  }	
 
 
-	# PP - Now make sure no two states have IsActive=1
-        $sql = "select Name from States where IsActive = '1'";
-        $sth = $dbh->prepare_cached( $sql )
-                or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        $res = $sth->execute()
-                or Fatal( "Can't execute: ".$sth->errstr() );
+# PP - Now make sure no two states have IsActive=1
+  $sql = "SELECT Name FROM States WHERE IsActive = '1'";
+  $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+  $res = $sth->execute()
+    or Fatal( "Can't execute: ".$sth->errstr() );
 
-        if ( $sth->rows != 1 )
-	{
-		Info( "Fixing States table so only one run state is active" );
-		resetStates();
-		$sql = "update States set IsActive='1' WHERE Name='default'";
-        	$sth = $dbh->prepare_cached( $sql )
-        	        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                $res = $sth->execute()
-               		or Fatal( "Can't execute: ".$sth->errstr() );
-
-
-	}
+  if ( $sth->rows != 1 ) {
+    Info( 'Fixing States table so only one run state is active' );
+    resetStates();
+    $sql = "UPDATE States SET IsActive='1' WHERE Name='default'";
+    $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    $res = $sth->execute()
+      or Fatal( "Can't execute: ".$sth->errstr() );
+  }
 }
 
 
 # PP - zeroes out isActive for all states
-sub resetStates
-{
-        $dbh = zmDbConnect() if ! $dbh;
-        my $sql = "update States set IsActive = '0'";
-        my $sth = $dbh->prepare_cached( $sql )
-                or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute()
-                or Fatal( "Can't execute: ".$sth->errstr() );
+sub resetStates {
+  $dbh = zmDbConnect() if ! $dbh;
+  my $sql = "UPDATE States SET IsActive='0'";
+  my $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute()
+    or Fatal( "Can't execute: ".$sth->errstr() );
 
 }
 
-sub systemdRunning
-{
-    my $result = 0;
+sub systemdRunning {
+  my $result = 0;
 
-    my $output = qx(ps -o comm="" -p 1);
-    chomp( $output );
+  my $output = qx(ps -o comm="" -p 1);
+  chomp( $output );
 
-    if ($output =~ /systemd/) {
-        $result = 1;
+  if ( $output =~ /systemd/ ) {
+    $result = 1;
+  }
+
+  return $result;
+}
+
+sub calledBysystem {
+  my $result = 0;
+  my $ppid = getppid();
+
+  my $output = qx(ps -o comm="" -p $ppid);
+  chomp( $output );
+
+  if ($output =~ /^(?:systemd|init)$/) {
+    $result = 1;
+  }
+
+  return $result;
+}
+
+sub verifyFolder {
+  my $folder = shift;
+
+  # Recreate the temporary directory if it's been wiped
+  if ( !-e $folder ) {
+    Debug( "Recreating directory '$folder'" );
+    mkdir( $folder, 0774 )
+      or Fatal( "Can't create missing temporary directory '$folder': $!" );
+    my ( $runName ) = getpwuid( $> );
+    if ( $runName ne $Config{ZM_WEB_USER} ) {
+      # Not running as web user, so should be root in which case
+      # chown the directory
+      my ( $webName, $webPass, $webUid, $webGid ) = getpwnam( $Config{ZM_WEB_USER} )
+        or Fatal( "Can't get user details for web user '"
+            .$Config{ZM_WEB_USER}."': $!"
+            );
+      chown( $webUid, $webGid, "$folder" )
+        or Fatal( "Can't change ownership of directory '$folder' to '"
+            .$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!"
+            );
     }
-
-    return $result;
+  }
 }
 
-sub calledBysystem
-{
-    my $result = 0;
-    my $ppid = getppid();
-
-    my $output = qx(ps -o comm="" -p $ppid);
-    chomp( $output );
-
-    if ($output =~ /^(?:systemd|init)$/) {
-        $result = 1;
-    }
-
-    return $result;
-}
-
-sub verifyFolder
-{
-    my $folder = shift;
-
-        # Recreate the temporary directory if it's been wiped
-        if ( !-e $folder )
-        {
-            Debug( "Recreating directory '$folder'" );
-            mkdir( "$folder", 0774 )
-                or Fatal( "Can't create missing temporary directory '$folder': $!" );
-            my ( $runName ) = getpwuid( $> );
-            if ( $runName ne $Config{ZM_WEB_USER} )
-            {
-                # Not running as web user, so should be root in which case
-                # chown the directory
-                my ( $webName, $webPass, $webUid, $webGid ) = getpwnam( $Config{ZM_WEB_USER} )
-                    or Fatal( "Can't get user details for web user '"
-                              .$Config{ZM_WEB_USER}."': $!"
-                       );
-                chown( $webUid, $webGid, "$folder" )
-                    or Fatal( "Can't change ownership of directory '$folder' to '"
-                              .$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!"
-                       );
-            }
-        }
-}
+1;
 __END__
+
+=head1 NAME
+
+zmpkg.pl - ZoneMinder Package Control Script
+
+=head1 SYNOPSIS
+
+zmpkg.pl {start|stop|restart|status|logrot|'state'|version}
+
+=head1 DESCRIPTION
+
+  This script is used to start and stop the ZoneMinder package primarily to
+allow command line control for automatic restart on reboot (see zm script)
+
+=cut
diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 393d8fe90..c1a2d78e7 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -55,6 +55,7 @@ use constant START_DELAY => 30; # To give everything else time to start
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
+use ZoneMinder::Storage;
 use POSIX;
 use DBI;
 use autouse 'Data::Dumper'=>qw(Dumper);
@@ -175,6 +176,14 @@ while( 1 ) {
     # Prevent open handles building up if we have connect to shared memory
     zmMemInvalidate( $monitor ); # Close our file handle to the zmc process we are about to end
   } # end foreach monitor
+  my $diskspace_sql = 'UPDATE Storage SET DiskSpace =(SELECT SUM(DiskSpace) FROM Events WHERE StorageId=? AND DiskSpace IS NOT NULL)';
+  my $diskspace_sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+  foreach my $Storage ( ZoneMinder::Storage->find() ) {
+    Error("Updating disk space for $$Storage{Name}");
+    $diskspace_sth->execute( $$Storage{Id} ) or Error( "Can't execute: ".$diskspace_sth->errstr() );
+  }
+  $diskspace_sth->finish();
   sleep( $Config{ZM_WATCH_CHECK_INTERVAL} );
 } # end while (1)
 
diff --git a/src/snprintf.cpp b/src/snprintf.cpp
deleted file mode 100644
index 3476822de..000000000
--- a/src/snprintf.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-snprintf( swap_path, sizeof(swap_path), "%s/zmswap-m%d/zmswap-q%06d", staticConfig.PATH_SWAP.c_str(), monitor->Id(), connkey );
-
-int len = snprintf(NULL, 0, "/zmswap-m%d", monitor->Id());
-
-
-  int swap_path_length = strlen(staticConfig.PATH_SWAP.c_str()) + snprintf(NULL, 0, "/zmswap-m%d", monitor->Id() ) + snprintf(NULL, 0, "/zmswap-q%06d", connkey ) + 1; // +1 for NULL terminator
-
-  if ( connkey && playback_buffer > 0 ) {
-
-    if ( swap_path_length + max_swap_len_suffix > PATH_MAX ) {
-      Error( "Swap Path is too long. %d > %d ", swap_path_length+max_swap_len_suffix, PATH_MAX );
-    } else {
-      swap_path = (char *)malloc( swap_path_length+max_swap_len_suffix );
-      Debug( 3, "Checking swap image path %s", staticConfig.PATH_SWAP.c_str() );
-      strncpy( swap_path, staticConfig.PATH_SWAP.c_str(), swap_path_length );
-      if ( checkSwapPath( swap_path, false ) ) {
-        snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-m%d", monitor->Id() );
-        if ( checkSwapPath( swap_path, true ) ) {
-          snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-q%06d", connkey );
-          if ( checkSwapPath( swap_path, true ) ) {
-            buffered_playback = true;
-          }
-        }
-      }
-
diff --git a/src/zm_box.h b/src/zm_box.h
index 3432bacc5..fa377e593 100644
--- a/src/zm_box.h
+++ b/src/zm_box.h
@@ -43,7 +43,7 @@ public:
   inline Box()
   {
   }
-  inline Box( int p_size ) : lo( 0, 0 ), hi ( p_size-1, p_size-1 ), size( Coord::Range( hi, lo ) ) { }
+  explicit inline Box( int p_size ) : lo( 0, 0 ), hi ( p_size-1, p_size-1 ), size( Coord::Range( hi, lo ) ) { }
   inline Box( int p_x_size, int p_y_size ) : lo( 0, 0 ), hi ( p_x_size-1, p_y_size-1 ), size( Coord::Range( hi, lo ) ) { }
   inline Box( int lo_x, int lo_y, int hi_x, int hi_y ) : lo( lo_x, lo_y ), hi( hi_x, hi_y ), size( Coord::Range( hi, lo ) ) { }
   inline Box( const Coord &p_lo, const Coord &p_hi ) : lo( p_lo ), hi( p_hi ), size( Coord::Range( hi, lo ) ) { }
diff --git a/src/zm_buffer.h b/src/zm_buffer.h
index 31898eb95..8f47c7cbc 100644
--- a/src/zm_buffer.h
+++ b/src/zm_buffer.h
@@ -36,7 +36,7 @@ protected:
 public:
   Buffer() : mStorage( 0 ), mAllocation( 0 ), mSize( 0 ), mHead( 0 ), mTail( 0 ) {
   }
-  Buffer( unsigned int pSize ) : mAllocation( pSize ), mSize( 0 ) {
+  explicit Buffer( unsigned int pSize ) : mAllocation( pSize ), mSize( 0 ) {
     mHead = mStorage = new unsigned char[mAllocation];
     mTail = mHead;
   }
diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp
index 0ea7af373..afcce7616 100644
--- a/src/zm_camera.cpp
+++ b/src/zm_camera.cpp
@@ -45,6 +45,7 @@ Camera::Camera( unsigned int p_monitor_id, SourceType p_type, unsigned int p_wid
   } else if(colours == ZM_COLOUR_RGB24 && ((imagesize % 64) != 0 || (imagesize % 12) != 0)) {
     Fatal("Image size is not multiples of 12 and 64");
   }
+    monitor = NULL;
 }
 
 Camera::~Camera() {
diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp
index 24d1a1a63..228e02f37 100644
--- a/src/zm_comms.cpp
+++ b/src/zm_comms.cpp
@@ -42,11 +42,10 @@
 #include <sys/filio.h> // define FIONREAD
 #endif
 
-int CommsBase::readV( int iovcnt, /* const void *, int, */ ... )
-{
+int CommsBase::readV( int iovcnt, /* const void *, int, */ ... ) {
   va_list arg_ptr;
-  //struct iovec iov[iovcnt];
-  struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
+  struct iovec iov[iovcnt];
+  //struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
 
   va_start( arg_ptr, iovcnt );
   for ( int i = 0; i < iovcnt; i++ )
@@ -62,11 +61,10 @@ int CommsBase::readV( int iovcnt, /* const void *, int, */ ... )
   return( nBytes );
 }
 
-int CommsBase::writeV( int iovcnt, /* const void *, int, */ ... )
-{
+int CommsBase::writeV( int iovcnt, /* const void *, int, */ ... ) {
   va_list arg_ptr;
-  //struct iovec iov[iovcnt];
-  struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
+  struct iovec iov[iovcnt];
+  //struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
 
   va_start( arg_ptr, iovcnt );
   for ( int i = 0; i < iovcnt; i++ )
@@ -761,10 +759,10 @@ void Select::clearTimeout()
 void Select::calcMaxFd()
 {
   mMaxFd = -1;
-  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
+  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter )
     if ( (*iter)->getMaxDesc() > mMaxFd )
       mMaxFd = (*iter)->getMaxDesc();
-  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
+  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter )
     if ( (*iter)->getMaxDesc() > mMaxFd )
       mMaxFd = (*iter)->getMaxDesc();
 }
@@ -839,12 +837,12 @@ int Select::wait()
 
   mReadable.clear();
   FD_ZERO(&rfds);
-  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
+  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter )
     FD_SET((*iter)->getReadDesc(),&rfds);
 
   mWriteable.clear();
   FD_ZERO(&wfds);
-  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
+  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter )
     FD_SET((*iter)->getWriteDesc(),&wfds);
 
   int nFound = select( mMaxFd+1, &rfds, &wfds, NULL, selectTimeout );
@@ -858,10 +856,10 @@ int Select::wait()
   }
   else
   {
-    for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
+    for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter )
       if ( FD_ISSET((*iter)->getReadDesc(),&rfds) )
         mReadable.push_back( *iter );
-    for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
+    for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter )
       if ( FD_ISSET((*iter)->getWriteDesc(),&rfds) )
         mWriteable.push_back( *iter );
   }
diff --git a/src/zm_comms.h b/src/zm_comms.h
index ae5fd5b08..b5974771d 100644
--- a/src/zm_comms.h
+++ b/src/zm_comms.h
@@ -37,26 +37,20 @@
 #include <netinet/in.h>
 #endif
 
-class CommsException : public Exception
-{
+class CommsException : public Exception {
 public:
-  CommsException( const std::string &message ) : Exception( message )
-  {
-  }
+  explicit CommsException( const std::string &message ) : Exception( message ) { }
 };
 
-class CommsBase
-{
+class CommsBase {
 protected:
   const int  &mRd;
   const int  &mWd;
 
 protected:
-  CommsBase( int &rd, int &wd ) : mRd( rd ), mWd( wd )
-  {
+  CommsBase( int &rd, int &wd ) : mRd( rd ), mWd( wd ) {
   }
-  virtual ~CommsBase()
-  {
+  virtual ~CommsBase() {
   }
 
 public:
@@ -66,42 +60,35 @@ public:
   virtual bool setBlocking( bool blocking )=0;
 
 public:
-  int getReadDesc() const
-  {
+  int getReadDesc() const {
     return( mRd );
   }
-  int getWriteDesc() const
-  {
+  int getWriteDesc() const {
     return( mWd );
   }
-  int getMaxDesc() const
-  {
+  int getMaxDesc() const {
     return( mRd>mWd?mRd:mWd );
   }
 
-  virtual int read( void *msg, int len )
-  {
+  virtual int read( void *msg, int len ) {
     ssize_t nBytes = ::read( mRd, msg, len );
     if ( nBytes < 0 )
       Debug( 1, "Read of %d bytes max on rd %d failed: %s", len, mRd, strerror(errno) );
     return( nBytes );
   }
-  virtual int write( const void *msg, int len )
-  {
+  virtual int write( const void *msg, int len ) {
     ssize_t nBytes = ::write( mWd, msg, len );
     if ( nBytes < 0 )
       Debug( 1, "Write of %d bytes on wd %d failed: %s", len, mWd, strerror(errno) );
     return( nBytes );
   }
-  virtual int readV( const struct iovec *iov, int iovcnt )
-  {
+  virtual int readV( const struct iovec *iov, int iovcnt ) {
     int nBytes = ::readv( mRd, iov, iovcnt );
     if ( nBytes < 0 )
       Debug( 1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno) );
     return( nBytes );
   }
-  virtual int writeV( const struct iovec *iov, int iovcnt )
-  {
+  virtual int writeV( const struct iovec *iov, int iovcnt ) {
     ssize_t nBytes = ::writev( mWd, iov, iovcnt );
     if ( nBytes < 0 )
       Debug( 1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno) );
@@ -111,19 +98,16 @@ public:
   virtual int writeV( int iovcnt, /* const void *msg1, int len1, */ ... );
 };
 
-class Pipe : public CommsBase
-{
+class Pipe : public CommsBase {
 protected:
   int mFd[2];
 
 public:
-  Pipe() : CommsBase( mFd[0], mFd[1] )
-  {
+  Pipe() : CommsBase( mFd[0], mFd[1] ) {
     mFd[0] = -1;
     mFd[1] = -1;
   }
-  ~Pipe()
-  {
+  ~Pipe() {
     close();
   }
 
@@ -147,46 +131,39 @@ public:
   bool setBlocking( bool blocking );
 };
 
-class SockAddr
-{
+class SockAddr {
 private:
   const struct sockaddr *mAddr;
 
 public:
-  SockAddr( const struct sockaddr *addr );
-  virtual ~SockAddr()
-  {
+  explicit SockAddr( const struct sockaddr *addr );
+  virtual ~SockAddr() {
   }
 
   static SockAddr *newSockAddr( const struct sockaddr &addr, socklen_t len );
   static SockAddr *newSockAddr( const SockAddr *addr );
 
-  int getDomain() const
-  {
+  int getDomain() const {
     return( mAddr?mAddr->sa_family:AF_UNSPEC );
   }
 
-  const struct sockaddr *getAddr() const
-  {
+  const struct sockaddr *getAddr() const {
     return( mAddr );
   }
   virtual socklen_t getAddrSize() const=0;
   virtual struct sockaddr *getTempAddr() const=0;
 };
 
-class SockAddrInet : public SockAddr
-{
+class SockAddrInet : public SockAddr {
 private:
   struct sockaddr_in  mAddrIn;
   struct sockaddr_in  mTempAddrIn;
 
 public:
   SockAddrInet();
-  SockAddrInet( const SockAddrInet &addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( addr.mAddrIn )
-  {
+  explicit SockAddrInet( const SockAddrInet &addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( addr.mAddrIn ) {
   }
-  SockAddrInet( const struct sockaddr_in *addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( *addr )
-  {
+  explicit SockAddrInet( const struct sockaddr_in *addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( *addr ) {
   }
 
 
@@ -195,57 +172,47 @@ public:
   bool resolve( const char *serv, const char *proto );
   bool resolve( int port, const char *proto );
 
-  socklen_t getAddrSize() const
-  {
+  socklen_t getAddrSize() const {
     return( sizeof(mAddrIn) );
   }
-  struct sockaddr *getTempAddr() const
-  {
+  struct sockaddr *getTempAddr() const {
     return( (sockaddr *)&mTempAddrIn );
   }
 
 public:
-  static socklen_t addrSize()
-  {
+  static socklen_t addrSize() {
     return( sizeof(sockaddr_in) );
   }
 };
 
-class SockAddrUnix : public SockAddr
-{
+class SockAddrUnix : public SockAddr {
 private:
   struct sockaddr_un  mAddrUn;
   struct sockaddr_un  mTempAddrUn;
 
 public:
   SockAddrUnix();
-  SockAddrUnix( const SockAddrUnix &addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( addr.mAddrUn )
-  {
+  SockAddrUnix( const SockAddrUnix &addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( addr.mAddrUn ) {
   }
-  SockAddrUnix( const struct sockaddr_un *addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( *addr )
-  {
+  SockAddrUnix( const struct sockaddr_un *addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( *addr ) {
   }
 
   bool resolve( const char *path, const char *proto );
 
-  socklen_t getAddrSize() const
-  {
+  socklen_t getAddrSize() const {
     return( sizeof(mAddrUn) );
   }
-  struct sockaddr *getTempAddr() const
-  {
+  struct sockaddr *getTempAddr() const {
     return( (sockaddr *)&mTempAddrUn );
   }
 
 public:
-  static socklen_t addrSize()
-  {
+  static socklen_t addrSize() {
     return( sizeof(sockaddr_un) );
   }
 };
 
-class Socket : public CommsBase
-{
+class Socket : public CommsBase {
 protected:
   typedef enum { CLOSED, DISCONNECTED, LISTENING, CONNECTED } State;
 
@@ -256,45 +223,37 @@ protected:
   SockAddr *mRemoteAddr;
 
 protected:
-  Socket() : CommsBase( mSd, mSd ), mSd( -1 ), mState( CLOSED ), mLocalAddr( 0 ), mRemoteAddr( 0 )
-  {
+  Socket() : CommsBase( mSd, mSd ), mSd( -1 ), mState( CLOSED ), mLocalAddr( 0 ), mRemoteAddr( 0 ) {
   }
-  Socket( const Socket &socket, int newSd ) : CommsBase( mSd, mSd ), mSd( newSd ), mState( CONNECTED ), mLocalAddr( 0 ), mRemoteAddr( 0 )
-  {
+  Socket( const Socket &socket, int newSd ) : CommsBase( mSd, mSd ), mSd( newSd ), mState( CONNECTED ), mLocalAddr( 0 ), mRemoteAddr( 0 ) {
     if ( socket.mLocalAddr )
       mLocalAddr = SockAddr::newSockAddr( mLocalAddr );
     if ( socket.mRemoteAddr )
       mRemoteAddr = SockAddr::newSockAddr( mRemoteAddr );
   }
-  virtual ~Socket()
-  {
+  virtual ~Socket() {
     close();
     delete mLocalAddr;
     delete mRemoteAddr;
   }
 
 public:
-  bool isOpen() const
-  {
+  bool isOpen() const {
     return( !isClosed() );
   }
-  bool isClosed() const
-  {
+  bool isClosed() const {
     return( mState == CLOSED );
   }
-  bool isDisconnected() const
-  {
+  bool isDisconnected() const {
     return( mState == DISCONNECTED );
   }
-  bool isConnected() const
-  {
+  bool isConnected() const {
     return( mState == CONNECTED );
   }
   virtual bool close();
 
 protected:
-  bool isListening() const
-  {
+  bool isListening() const {
     return( mState == LISTENING );
   }
 
@@ -309,33 +268,28 @@ protected:
   virtual bool accept( int & );
 
 public:
-  virtual int send( const void *msg, int len ) const
-  {
+  virtual int send( const void *msg, int len ) const {
     ssize_t nBytes = ::send( mSd, msg, len, 0 );
     if ( nBytes < 0 )
       Debug( 1, "Send of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
     return( nBytes );
   }
-  virtual int recv( void *msg, int len ) const
-  {
+  virtual int recv( void *msg, int len ) const {
     ssize_t nBytes = ::recv( mSd, msg, len, 0 );
     if ( nBytes < 0 )
       Debug( 1, "Recv of %d bytes max on sd %d failed: %s", len, mSd, strerror(errno) );
     return( nBytes );
   }
-  virtual int send( const std::string &msg ) const
-  {
+  virtual int send( const std::string &msg ) const {
     ssize_t nBytes = ::send( mSd, msg.data(), msg.size(), 0 );
     if ( nBytes < 0 )
       Debug( 1, "Send of string '%s' (%zd bytes) on sd %d failed: %s", msg.c_str(), msg.size(), mSd, strerror(errno) );
     return( nBytes );
   }
-  virtual int recv( std::string &msg ) const
-  {
+  virtual int recv( std::string &msg ) const {
     char buffer[msg.capacity()];
     int nBytes = 0;
-    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 )
-    {
+    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 ) {
       Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", sizeof(buffer), mSd, strerror(errno) );
       return( nBytes );
     }
@@ -343,12 +297,10 @@ public:
     msg = buffer;
     return( nBytes );
   }
-  virtual int recv( std::string &msg, size_t maxLen ) const
-  {
+  virtual int recv( std::string &msg, size_t maxLen ) const {
     char buffer[maxLen];
     int nBytes = 0;
-    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 )
-    {
+    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 ) {
       Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", maxLen, mSd, strerror(errno) );
       return( nBytes );
     }
@@ -358,8 +310,7 @@ public:
   }
   virtual int bytesToRead() const;
 
-  int getDesc() const
-  {
+  int getDesc() const {
     return( mSd );
   }
   //virtual bool isOpen() const
@@ -371,12 +322,10 @@ public:
   virtual int getType() const=0;
   virtual const char *getProtocol() const=0;
 
-  const SockAddr *getLocalAddr() const
-  {
+  const SockAddr *getLocalAddr() const {
     return( mLocalAddr );
   }
-  const SockAddr *getRemoteAddr() const
-  {
+  const SockAddr *getRemoteAddr() const {
     return( mRemoteAddr );
   }
   virtual socklen_t getAddrSize() const=0;
@@ -403,12 +352,10 @@ protected:
     int mAddressFamily;
 
 public:
-int getDomain() const
-{
+int getDomain() const {
   return( mAddressFamily );
 }
-virtual socklen_t getAddrSize() const
-{
+virtual socklen_t getAddrSize() const {
   return( SockAddrInet::addrSize() );
 }
 
@@ -422,88 +369,68 @@ protected:
   bool bind( int port );
 };
 
-class UnixSocket : virtual public Socket
-{
+class UnixSocket : virtual public Socket {
 public:
-  int getDomain() const
-  {
+  int getDomain() const {
     return( AF_UNIX );
   }
-  virtual socklen_t getAddrSize() const
-  {
+  virtual socklen_t getAddrSize() const {
     return( SockAddrUnix::addrSize() );
   }
 
 protected:
-  bool resolveLocal( const char *serv, const char *proto )
-  {
+  bool resolveLocal( const char *serv, const char *proto ) {
     SockAddrUnix *addr = new SockAddrUnix;
     mLocalAddr = addr;
     return( addr->resolve( serv, proto ) );
   }
 
-  bool resolveRemote( const char *path, const char *proto )
-  {
+  bool resolveRemote( const char *path, const char *proto ) {
     SockAddrUnix *addr = new SockAddrUnix;
     mRemoteAddr = addr;
     return( addr->resolve( path, proto ) );
   }
 
 protected:
-  bool bind( const char *path )
-  {
+  bool bind( const char *path ) {
     if ( !UnixSocket::resolveLocal( path, getProtocol() ) )
       return( false );
     return( Socket::bind() );
   }
 
-  bool connect( const char *path )
-  {
+  bool connect( const char *path ) {
     if ( !UnixSocket::resolveRemote( path, getProtocol() ) )
       return( false );
     return( Socket::connect() );
   }
 };
 
-class UdpSocket : virtual public Socket
-{
+class UdpSocket : virtual public Socket {
 public:
-  int getType() const
-  {
+  int getType() const {
     return( SOCK_DGRAM );
   }
-  const char *getProtocol() const
-  {
+  const char *getProtocol() const {
     return( "udp" );
   }
 
 public:
-  virtual int sendto( const void *msg, int len, const SockAddr *addr=0 ) const
-  {
+  virtual int sendto( const void *msg, int len, const SockAddr *addr=0 ) const {
     ssize_t nBytes = ::sendto( mSd, msg, len, 0, addr?addr->getAddr():NULL, addr?addr->getAddrSize():0 );
     if ( nBytes < 0 )
       Debug( 1, "Sendto of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
     return( nBytes );
   }
-  virtual int recvfrom( void *msg, int len, SockAddr *addr=0 ) const
-  {
+  virtual int recvfrom( void *msg, int len, SockAddr *addr=0 ) const {
     ssize_t nBytes = 0;
-    if ( addr )
-    {
+    if ( addr ) {
       struct sockaddr sockAddr;
       socklen_t sockLen;
       nBytes = ::recvfrom( mSd, msg, len, 0, &sockAddr, &sockLen );
-      if ( nBytes < 0 )
-      {
+      if ( nBytes < 0 ) {
         Debug( 1, "Recvfrom of %d bytes max on sd %d (with address) failed: %s", len, mSd, strerror(errno) );
       }
-      else if ( sockLen )
-      {
-        addr = SockAddr::newSockAddr( sockAddr, sockLen );
-      }
-    }   
-    else
-    {
+    } else {
       nBytes = ::recvfrom( mSd, msg, len, 0, NULL, 0 );
       if ( nBytes < 0 )
         Debug( 1, "Recvfrom of %d bytes max on sd %d (no address) failed: %s", len, mSd, strerror(errno) );
@@ -512,194 +439,150 @@ public:
   }
 };
 
-class UdpInetSocket : virtual public UdpSocket, virtual public InetSocket
-{
+class UdpInetSocket : virtual public UdpSocket, virtual public InetSocket {
 public:
-  bool bind( const char *host, const char *serv ) 
-  {
+  bool bind( const char *host, const char *serv ) {
     return( InetSocket::bind( host, serv ) );
   }
-  bool bind( const char *host, int port )
-  {
+  bool bind( const char *host, int port ) {
     return( InetSocket::bind( host, port ) );
   }
-  bool bind( const char *serv )
-  {
+  bool bind( const char *serv ) {
     return( InetSocket::bind( serv ) );
   }
-  bool bind( int port )
-  {
+  bool bind( int port ) {
     return( InetSocket::bind( port ) );
   }
 
-  bool connect( const char *host, const char *serv )
-  {
+  bool connect( const char *host, const char *serv ) {
     return( InetSocket::connect( host, serv ) );
   }
-  bool connect( const char *host, int port )
-  {
+  bool connect( const char *host, int port ) {
     return( InetSocket::connect( host, port ) );
   }
 };
 
-class UdpUnixSocket : virtual public UdpSocket, virtual public UnixSocket
-{
+class UdpUnixSocket : virtual public UdpSocket, virtual public UnixSocket {
 public:
-  bool bind( const char *path )
-  {
+  bool bind( const char *path ) {
     return( UnixSocket::bind( path ) );
   }
 
-  bool connect( const char *path )
-  {
+  bool connect( const char *path ) {
     return( UnixSocket::connect( path ) );
   }
 };
 
-class UdpInetClient : public UdpInetSocket
-{
+class UdpInetClient : public UdpInetSocket {
 public:
-  bool connect( const char *host, const char *serv )
-  {
+  bool connect( const char *host, const char *serv ) {
     return( UdpInetSocket::connect( host, serv ) );
   }
-  bool connect( const char *host, int port )
-  {
+  bool connect( const char *host, int port ) {
     return( UdpInetSocket::connect( host, port ) );
   }
 };
 
-class UdpUnixClient : public UdpUnixSocket
-{
+class UdpUnixClient : public UdpUnixSocket {
 public:
-  bool bind( const char *path )
-  {
+  bool bind( const char *path ) {
     return( UdpUnixSocket::bind( path ) );
   }
 
 public:
-  bool connect( const char *path )
-  {
+  bool connect( const char *path ) {
     return( UdpUnixSocket::connect( path) );
   }
 };
 
-class UdpInetServer : public UdpInetSocket
-{
+class UdpInetServer : public UdpInetSocket {
 public:
-  bool bind( const char *host, const char *serv )
-  {
+  bool bind( const char *host, const char *serv ) {
     return( UdpInetSocket::bind( host, serv ) );
   }
-  bool bind( const char *host, int port )
-  {
+  bool bind( const char *host, int port ) {
     return( UdpInetSocket::bind( host, port ) );
   }
-  bool bind( const char *serv )
-  {
+  bool bind( const char *serv ) {
     return( UdpInetSocket::bind( serv ) );
   }
-  bool bind( int port )
-  {
+  bool bind( int port ) {
     return( UdpInetSocket::bind( port ) );
   }
 
 protected:
-  bool connect( const char *host, const char *serv )
-  {
+  bool connect( const char *host, const char *serv ) {
     return( UdpInetSocket::connect( host, serv ) );
   }
-  bool connect( const char *host, int port )
-  {
+  bool connect( const char *host, int port ) {
     return( UdpInetSocket::connect( host, port ) );
   }
 };
 
-class UdpUnixServer : public UdpUnixSocket
-{
+class UdpUnixServer : public UdpUnixSocket {
 public:
-  bool bind( const char *path )
-  {
+  bool bind( const char *path ) {
     return( UdpUnixSocket::bind( path ) );
   }
 
 protected:
-  bool connect( const char *path )
-  {
+  bool connect( const char *path ) {
     return( UdpUnixSocket::connect( path ) );
   }
 };
 
-class TcpSocket : virtual public Socket
-{
+class TcpSocket : virtual public Socket {
 public:
-  TcpSocket()
-  {
+  TcpSocket() {
   }
-  TcpSocket( const TcpSocket &socket, int newSd ) : Socket( socket, newSd )
-  {
+  TcpSocket( const TcpSocket &socket, int newSd ) : Socket( socket, newSd ) {
   }
 
 public:
-  int getType() const
-  {
+  int getType() const {
     return( SOCK_STREAM );
   }
-  const char *getProtocol() const
-  {
+  const char *getProtocol() const {
     return( "tcp" );
   }
 };
 
-class TcpInetSocket : virtual public TcpSocket, virtual public InetSocket
-{
+class TcpInetSocket : virtual public TcpSocket, virtual public InetSocket {
 public:
-  TcpInetSocket()
-  {
+  TcpInetSocket() {
   }
-  TcpInetSocket( const TcpInetSocket &socket, int newSd ) : TcpSocket( socket, newSd )
-  {
+  TcpInetSocket( const TcpInetSocket &socket, int newSd ) : TcpSocket( socket, newSd ) {
   }
 };
 
-class TcpUnixSocket : virtual public TcpSocket, virtual public UnixSocket
-{
+class TcpUnixSocket : virtual public TcpSocket, virtual public UnixSocket {
 public:
-  TcpUnixSocket()
-  {
+  TcpUnixSocket() {
   }
-  TcpUnixSocket( const TcpUnixSocket &socket, int newSd ) : TcpSocket( socket, newSd )
-  {
+  TcpUnixSocket( const TcpUnixSocket &socket, int newSd ) : TcpSocket( socket, newSd ) {
   }
 };
 
-class TcpInetClient : public TcpInetSocket
-{
+class TcpInetClient : public TcpInetSocket {
 public:
-  bool connect( const char *host, const char *serv )
-  {
+  bool connect( const char *host, const char *serv ) {
     return( TcpInetSocket::connect( host, serv ) );
   }
-  bool connect( const char *host, int port )
-  {
+  bool connect( const char *host, int port ) {
     return( TcpInetSocket::connect( host, port ) );
   }
 };
 
-class TcpUnixClient : public TcpUnixSocket
-{
+class TcpUnixClient : public TcpUnixSocket {
 public:
-  bool connect( const char *path )
-  {
+  bool connect( const char *path ) {
     return( TcpUnixSocket::connect( path) );
   }
 };
 
-class TcpInetServer : public TcpInetSocket
-{
+class TcpInetServer : public TcpInetSocket {
 public:
-  bool bind( int port )
-  {
+  bool bind( int port ) {
     return( TcpInetSocket::bind( port ) );
   }
 
@@ -710,11 +593,9 @@ public:
   bool accept( TcpInetSocket *&newSocket );
 };
 
-class TcpUnixServer : public TcpUnixSocket
-{
+class TcpUnixServer : public TcpUnixSocket {
 public:
-  bool bind( const char *path )
-  {
+  bool bind( const char *path ) {
     return( TcpUnixSocket::bind( path ) );
   }
 
@@ -725,8 +606,7 @@ public:
   bool accept( TcpUnixSocket *&newSocket );
 };
 
-class Select
-{
+class Select {
 public:
   typedef std::set<CommsBase *> CommsSet;
   typedef std::vector<CommsBase *> CommsList;
diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 9ab484fb4..116ccc274 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -216,6 +216,33 @@ ConfigItem::ConfigItem( const char *p_name, const char *p_value, const char *con
   accessed = false;
 }
 
+ConfigItem::ConfigItem( const ConfigItem &item ) {
+  name = new char[strlen(item.name)+1];
+  strcpy( name, item.name );
+  value = new char[strlen(item.value)+1];
+  strcpy( value, item.value );
+  type = new char[strlen(item.type)+1];
+  strcpy( type, item.type );
+
+  //Info( "Created new config item %s = %s (%s)\n", name, value, type );
+
+  accessed = false;
+}
+void ConfigItem::Copy( const ConfigItem &item ) {
+  if (name) delete name;
+  name = new char[strlen(item.name)+1];
+  strcpy( name, item.name );
+  if (value) delete value;
+  value = new char[strlen(item.value)+1];
+  strcpy( value, item.value );
+  if (type) delete type;
+  type = new char[strlen(item.type)+1];
+  strcpy( type, item.type );
+
+  //Info( "Created new config item %s = %s (%s)\n", name, value, type );
+  accessed = false;
+}
+
 ConfigItem::~ConfigItem() {
   delete[] name;
   delete[] value;
diff --git a/src/zm_config.h.in b/src/zm_config.h.in
index a62057f1c..d09a2f351 100644
--- a/src/zm_config.h.in
+++ b/src/zm_config.h.in
@@ -107,25 +107,30 @@ private:
   mutable bool accessed;
 
 public:
-  ConfigItem( const char *p_name, const char *p_value, const char *const p_type );
+  ConfigItem(const char *p_name, const char *p_value, const char *const p_type);
+  ConfigItem(const ConfigItem &);
   ~ConfigItem();
+  void Copy(const ConfigItem&);
   void ConvertValue() const;
   bool BooleanValue() const;
   int IntegerValue() const;
   double DecimalValue() const;
   const char *StringValue() const;
 
+  ConfigItem &operator=(const ConfigItem item) {
+    Copy(item);return *this;
+  }
   inline operator bool() const {
-    return( BooleanValue() );
+    return BooleanValue();
   }
   inline operator int() const {
-    return( IntegerValue() );
+    return IntegerValue();
   }
   inline operator double() const {
-    return( DecimalValue() );
+    return DecimalValue();
   }
   inline operator const char *() const {
-    return( StringValue() );
+    return StringValue();
   }
 };
 
diff --git a/src/zm_coord.h b/src/zm_coord.h
index 5858cef23..9bf31144c 100644
--- a/src/zm_coord.h
+++ b/src/zm_coord.h
@@ -31,14 +31,13 @@ private:
   int x, y;
 
 public:
-  inline Coord() : x(0), y(0)
-  {
-  }
-  inline Coord( int p_x, int p_y ) : x(p_x), y(p_y)
-  {
-  }
-  inline Coord( const Coord &p_coord ) : x(p_coord.x), y(p_coord.y)
-  {
+  inline Coord() : x(0), y(0) { }
+  inline Coord( int p_x, int p_y ) : x(p_x), y(p_y) { }
+  inline Coord( const Coord &p_coord ) : x(p_coord.x), y(p_coord.y) { }
+  inline Coord &operator =( const Coord &coord ) {
+    x = coord.x;
+    y = coord.y;
+    return *this;
   }
   inline int &X() { return( x ); }
   inline const int &X() const { return( x ); }
diff --git a/src/zm_curl_camera.cpp b/src/zm_curl_camera.cpp
index dbd824dad..9277307a8 100644
--- a/src/zm_curl_camera.cpp
+++ b/src/zm_curl_camera.cpp
@@ -236,10 +236,10 @@ int cURLCamera::Capture( Image &image ) {
         if(!SubHeadersParsingComplete) {
           /* We haven't parsed all headers yet */
           need_more_data = true;
-        } else if(frame_content_length <= 0) {
+        } else if ( ! frame_content_length ) {
           /* Invalid frame */
           Error("Invalid frame: invalid content length");
-        } else if(frame_content_type != "image/jpeg") {
+        } else if ( frame_content_type != "image/jpeg" ) {
           /* Unsupported frame type */
           Error("Unsupported frame: %s",frame_content_type.c_str());
         } else if(frame_content_length > databuffer.size()) {
@@ -526,19 +526,19 @@ int cURLCamera::progress_callback(void *userdata, double dltotal, double dlnow,
 
 /* These functions call the functions in the class for the correct object */
 size_t data_callback_dispatcher(void *buffer, size_t size, size_t nmemb, void *userdata) {
-  return ((cURLCamera*)userdata)->data_callback(buffer,size,nmemb,userdata);
+  return reinterpret_cast<cURLCamera*>(userdata)->data_callback(buffer,size,nmemb,userdata);
 }
 
 size_t header_callback_dispatcher(void *buffer, size_t size, size_t nmemb, void *userdata) {
-  return ((cURLCamera*)userdata)->header_callback(buffer,size,nmemb,userdata);
+  return reinterpret_cast<cURLCamera*>(userdata)->header_callback(buffer,size,nmemb,userdata);
 }
 
 int progress_callback_dispatcher(void *userdata, double dltotal, double dlnow, double ultotal, double ulnow) {
-  return ((cURLCamera*)userdata)->progress_callback(userdata,dltotal,dlnow,ultotal,ulnow);
+  return reinterpret_cast<cURLCamera*>(userdata)->progress_callback(userdata,dltotal,dlnow,ultotal,ulnow);
 }
 
 void* thread_func_dispatcher(void* object) {
-  return ((cURLCamera*)object)->thread_func();
+  return reinterpret_cast<cURLCamera*>(object)->thread_func();
 }
 
 #endif // HAVE_LIBCURL
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 9b98ea4c1..57ebafbd0 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -71,7 +71,7 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
 
   static char sql[ZM_SQL_MED_BUFSIZ];
   struct tm *stime = localtime( &start_time.tv_sec );
-  snprintf( sql, sizeof(sql), "insert into Events ( MonitorId, StorageId, Name, StartTime, Width, Height, Cause, Notes, StateId, Orientation, Videoed ) values ( %d, %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', %d, %d, %d )", 
+  snprintf( sql, sizeof(sql), "INSERT INTO Events ( MonitorId, StorageId, Name, StartTime, Width, Height, Cause, Notes, StateId, Orientation, Videoed, DefaultVideo, SaveJPEGs ) values ( %d, %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', %d, %d, %d, '', %d )",
       monitor->Id(), 
       storage->Id(),
       start_time.tv_sec,
@@ -81,7 +81,8 @@ Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string
       notes.c_str(), 
       state_id,
       monitor->getOrientation(),
-      videoEvent
+      videoEvent,
+      monitor->GetOptSaveJPEGs()
       );
   if ( mysql_query( &dbconn, sql ) ) {
     Error( "Can't insert event: %s. sql was (%s)", mysql_error( &dbconn ), sql );
@@ -211,7 +212,9 @@ Event::~Event() {
   if ( frames > last_db_frame ) {
 
     Debug( 1, "Adding closing frame %d to DB", frames );
-    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ( %d, %d, from_unixtime( %ld ), %s%ld.%02ld )", id, frames, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
+    snprintf( sql, sizeof(sql), 
+        "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ( %d, %d, from_unixtime( %ld ), %s%ld.%02ld )",
+        id, frames, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
     if ( mysql_query( &dbconn, sql ) ) {
       Error( "Can't insert frame: %s", mysql_error( &dbconn ) );
       exit( mysql_errno( &dbconn ) );
@@ -241,11 +244,11 @@ Event::~Event() {
 
 void Event::createNotes( std::string &notes ) {
   notes.clear();
-  for ( StringSetMap::const_iterator mapIter = noteSetMap.begin(); mapIter != noteSetMap.end(); mapIter++ ) {
+  for ( StringSetMap::const_iterator mapIter = noteSetMap.begin(); mapIter != noteSetMap.end(); ++mapIter ) {
     notes += mapIter->first;
     notes += ": ";
     const StringSet &stringSet = mapIter->second;
-    for ( StringSet::const_iterator setIter = stringSet.begin(); setIter != stringSet.end(); setIter++ ) {
+    for ( StringSet::const_iterator setIter = stringSet.begin(); setIter != stringSet.end(); ++setIter ) {
       if ( setIter != stringSet.begin() )
         notes += ", ";
       notes += *setIter;
@@ -316,7 +319,7 @@ void Event::updateNotes( const StringSetMap &newNoteSetMap ) {
       noteSetMap = newNoteSetMap;
       update = true;
     } else {
-      for ( StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin(); newNoteSetMapIter != newNoteSetMap.end(); newNoteSetMapIter++ ) {
+      for ( StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin(); newNoteSetMapIter != newNoteSetMap.end(); ++newNoteSetMapIter ) {
         const std::string &newNoteGroup = newNoteSetMapIter->first;
         const StringSet &newNoteSet = newNoteSetMapIter->second;
         //Info( "Got %d new strings", newNoteSet.size() );
@@ -329,7 +332,7 @@ void Event::updateNotes( const StringSetMap &newNoteSetMap ) {
           } else {
             StringSet &noteSet = noteSetMapIter->second;
             //Info( "Found note group %s, got %d strings", newNoteGroup.c_str(), newNoteSet.size() );
-            for ( StringSet::const_iterator newNoteSetIter = newNoteSet.begin(); newNoteSetIter != newNoteSet.end(); newNoteSetIter++ ) {
+            for ( StringSet::const_iterator newNoteSetIter = newNoteSet.begin(); newNoteSetIter != newNoteSet.end(); ++newNoteSetIter ) {
               const std::string &newNote = *newNoteSetIter;
               StringSet::iterator noteSetIter = noteSet.find( newNote );
               if ( noteSetIter == noteSet.end() ) {
@@ -390,7 +393,6 @@ void Event::updateNotes( const StringSetMap &newNoteSetMap ) {
     }
 
     strncpy( notesStr, notes.c_str(), sizeof(notesStr) );
-    notesLen = notes.length();
 
     if ( mysql_stmt_execute( stmt ) ) {
       Fatal( "Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt) );
diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index fc85ad0de..817c8753a 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -176,13 +176,13 @@ bool EventStream::loadEventData( int event_id ) {
   event_data->n_frames = mysql_num_rows( result );
 
   event_data->frames = new FrameData[event_data->frame_count];
-  int id, last_id = 0;
+  int last_id = 0;
   time_t timestamp, last_timestamp = event_data->start_time;
-  double delta, last_delta = 0.0;
+  double last_delta = 0.0;
   while ( ( dbrow = mysql_fetch_row( result ) ) ) {
-    id = atoi(dbrow[0]);
+    int id = atoi(dbrow[0]);
     timestamp = atoi(dbrow[1]);
-    delta = atof(dbrow[2]);
+    double delta = atof(dbrow[2]);
     int id_diff = id - last_id;
     double frame_delta = (delta-last_delta)/id_diff;
     if ( id_diff > 1 ) {
@@ -414,7 +414,6 @@ void EventStream::processCommand( const CmdMsg *msg ) {
         }
         send_frame = true;
         break;
-        send_frame = true;
       }
     case CMD_PAN :
       {
@@ -593,6 +592,7 @@ bool EventStream::sendFrame( int delta_us ) {
   FILE *fdj = NULL;
 
   // This needs to be abstracted.  If we are saving jpgs, then load the capture file.  If we are only saving analysis frames, then send that.
+  // // This is also wrong, need to have this info stored in the event! FIXME
   if ( monitor->GetOptSaveJPEGs() & 1 ) {
     snprintf( filepath, sizeof(filepath), staticConfig.capture_file_format, event_data->path, curr_frame_id );
   } else if ( monitor->GetOptSaveJPEGs() & 2 ) {
diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index 07e161214..c5964ee0b 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -27,6 +27,7 @@
 #include "zm_stream.h"
 #include "zm_video.h"
 #include "zm_ffmpeg_input.h"
+#include "zm_monitor.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -74,7 +75,7 @@ class EventStream : public StreamBase {
 
     int curr_frame_id;
     double curr_stream_time;
-      bool  send_frame;
+    bool  send_frame;
 
     EventData *event_data;
     FFmpeg_Input  *ffmpeg_input;
@@ -96,6 +97,7 @@ class EventStream : public StreamBase {
 
       curr_frame_id = 0;
       curr_stream_time = 0.0;
+      send_frame = false;
 
       event_data = 0;
 
@@ -108,11 +110,17 @@ class EventStream : public StreamBase {
     }
     void setStreamStart( int init_event_id, unsigned int init_frame_id=0 ) {
       loadInitialEventData( init_event_id, init_frame_id );
-      loadMonitor( event_data->monitor_id );
+      if ( !(monitor = Monitor::Load( event_data->monitor_id, false, Monitor::QUERY )) ) {
+        Fatal( "Unable to load monitor id %d for streaming", event_data->monitor_id );
+        return;
+      }
     }
     void setStreamStart( int monitor_id, time_t event_time ) {
       loadInitialEventData( monitor_id, event_time );
-      loadMonitor( monitor_id );
+      if ( !(monitor = Monitor::Load( event_data->monitor_id, false, Monitor::QUERY )) ) {
+        Fatal( "Unable to load monitor id %d for streaming", monitor_id );
+        return;
+      }
     }
     void setStreamMode( StreamMode p_mode ) {
       mode = p_mode;
diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 4ba88d900..ce0cd0eff 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -109,8 +109,6 @@ int av_dict_parse_string(AVDictionary **pm, const char *str,
                             const char *key_val_sep, const char *pairs_sep,
                             int flags)
    {
-       int ret;
-   
        if (!str)
           return 0;
    
@@ -118,7 +116,7 @@ int av_dict_parse_string(AVDictionary **pm, const char *str,
        flags &= ~(AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
    
        while (*str) {
-           if ((ret = parse_key_value_pair(pm, &str, key_val_sep, pairs_sep, flags)) < 0)
+           if ((int ret = parse_key_value_pair(pm, &str, key_val_sep, pairs_sep, flags)) < 0)
               return ret;
    
            if (*str)
@@ -133,6 +131,7 @@ int av_dict_parse_string(AVDictionary **pm, const char *str,
 #endif // HAVE_LIBAVCODEC || HAVE_LIBAVUTIL || HAVE_LIBSWSCALE
 
 #if HAVE_LIBAVUTIL
+#if LIBAVUTIL_VERSION_CHECK(56, 0, 0, 17, 100)
 int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts,  AVRational fs_tb, int duration, int64_t *last, AVRational out_tb){
   int64_t a, b, this_thing;
 
@@ -156,6 +155,7 @@ simple_round:
   return av_rescale_q(this_thing, fs_tb, out_tb);
 }
 #endif
+#endif
 
 int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat *oformat, const char *format, const char *filename) {
   AVFormatContext *s = avformat_alloc_context();
@@ -184,27 +184,13 @@ int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat
     }
   }
 
-  if (!oformat) {
-    if (format) {
-      oformat = av_guess_format(format, NULL, NULL);
-      if (!oformat) {
-        av_log(s, AV_LOG_ERROR, "Requested output format '%s' is not a suitable output format\n", format);
-        ret = AVERROR(EINVAL);
-      }
-    } else {
-      oformat = av_guess_format(NULL, filename, NULL);
-      if (!oformat) {
-        ret = AVERROR(EINVAL);
-        av_log(s, AV_LOG_ERROR, "Unable to find a suitable output format for '%s'\n", filename);
-      }
-    }
-  }
-
   if (ret) {
     avformat_free_context(s);
     return ret;
   } else {
     s->oformat = oformat;
+#if 0
+    // This is some very wrong code, and I don't think it is neccessary
     if (s->oformat->priv_data_size > 0) {
       s->priv_data = av_mallocz(s->oformat->priv_data_size);
       if (s->priv_data) {
@@ -219,6 +205,7 @@ int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat
       }
       s->priv_data = NULL;
     }
+#endif
 
     if (filename) strncpy(s->filename, filename, sizeof(s->filename));
     *avctx = s;
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index ee5437633..7a7a5f157 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -205,7 +205,6 @@ int FfmpegCamera::Capture( Image &image ) {
 
   int frameComplete = false;
   while ( !frameComplete ) {
-    int ret;
     int avResult = av_read_frame( mFormatContext, &packet );
     char errbuf[AV_ERROR_MAX_STRING_SIZE];
     if ( avResult < 0 ) {
@@ -231,6 +230,7 @@ int FfmpegCamera::Capture( Image &image ) {
     Debug( 5, "Got packet from stream %d dts (%d) pts(%d)", packet.stream_index, packet.pts, packet.dts );
     // What about audio stream? Maybe someday we could do sound detection...
     if ( ( packet.stream_index == mVideoStreamId ) && ( keyframe || have_video_keyframe ) ) {
+    int ret;
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       ret = avcodec_send_packet( mVideoCodecContext, &packet );
       if ( ret < 0 ) {
@@ -458,7 +458,9 @@ int FfmpegCamera::OpenFfmpeg() {
 	// STolen from ispy
 	//this fixes issues with rtsp streams!! woot.
 	//mVideoCodecContext->flags2 |= CODEC_FLAG2_FAST | CODEC_FLAG2_CHUNKS | CODEC_FLAG_LOW_DELAY;  // Enable faster H264 decode.
+#ifdef CODEC_FLAG2_FAST
 	mVideoCodecContext->flags2 |= CODEC_FLAG2_FAST | CODEC_FLAG_LOW_DELAY;
+#endif
 
 #if HAVE_AVUTIL_HWCONTEXT_H
   if ( mVideoCodecContext->codec_id == AV_CODEC_ID_H264 ) {
@@ -836,7 +838,6 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
           videoStore = NULL;
 
         } else {
-          strcpy(oldDirectory, event_file);
           monitor->SetVideoWriterEventId( last_event_id );
 
           // Need to write out all the frames from the last keyframe?
diff --git a/src/zm_ffmpeg_camera.h b/src/zm_ffmpeg_camera.h
index 9e10b76bf..9f83d8a15 100644
--- a/src/zm_ffmpeg_camera.h
+++ b/src/zm_ffmpeg_camera.h
@@ -85,8 +85,6 @@ class FfmpegCamera : public Camera {
 #endif // HAVE_LIBAVFORMAT
 
     VideoStore          *videoStore;
-    char                oldDirectory[4096];
-    unsigned int        old_event_id;
     zm_packetqueue      packetqueue;
     bool                have_video_keyframe;
 
diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp
index 6c715b6d1..70dafb76c 100644
--- a/src/zm_ffmpeg_input.cpp
+++ b/src/zm_ffmpeg_input.cpp
@@ -9,9 +9,14 @@ FFmpeg_Input::FFmpeg_Input() {
   audio_stream_id = -1;
   av_register_all();
   avcodec_register_all();
-
+  streams = NULL;
 }
+
 FFmpeg_Input::~FFmpeg_Input() {
+  if ( streams ) {
+    delete streams;
+    streams = NULL;
+  }
 }
 
 int FFmpeg_Input::Open( const char *filepath ) {
@@ -35,6 +40,8 @@ int FFmpeg_Input::Open( const char *filepath ) {
     return error;
   }
 
+  streams = new stream[input_format_context->nb_streams];
+
   for ( unsigned int i = 0; i < input_format_context->nb_streams; i += 1 ) {
     if ( is_video_stream( input_format_context->streams[i] ) ) {
       zm_dump_stream_format(input_format_context, i, 0, 0);
@@ -162,7 +169,7 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
 
     frameComplete = 1;
 # else
-    ret = zm_avcodec_decode_video( streams[packet.stream_index].context, frame, &frameComplete, &packet );
+    ret = zm_avcodec_decode_video( context, frame, &frameComplete, &packet );
     if ( ret < 0 ) {
       av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
       Error( "Unable to decode frame at frame %d: %s, continuing", streams[packet.stream_index].frame_count, errbuf );
diff --git a/src/zm_ffmpeg_input.h b/src/zm_ffmpeg_input.h
index 3e12f45cc..727fc110a 100644
--- a/src/zm_ffmpeg_input.h
+++ b/src/zm_ffmpeg_input.h
@@ -36,7 +36,7 @@ class FFmpeg_Input {
         int frame_count;
     } stream;
 
-    stream streams[2];
+    stream *streams;
     int video_stream_id;
     int audio_stream_id;
     AVFormatContext *input_format_context;
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 9dfb447da..1c0e5ac41 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -131,6 +131,7 @@ Image::Image( int p_width, int p_height, int p_colours, int p_subpixelorder, uin
 
 Image::Image( const AVFrame *frame ) {
   AVFrame *dest_frame = zm_av_frame_alloc();
+  text[0] = '\0';
 
   width = frame->width;
   height = frame->height;
@@ -457,7 +458,6 @@ void Image::Initialise() {
 
 /* Requests a writeable buffer to the image. This is safer than buffer() because this way we can guarantee that a buffer of required size exists */
 uint8_t* Image::WriteBuffer(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder) {
-  unsigned int newsize;
 
   if ( p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32 ) {
     Error("WriteBuffer called with unexpected colours: %d",p_colours);
@@ -470,7 +470,7 @@ uint8_t* Image::WriteBuffer(const unsigned int p_width, const unsigned int p_hei
   }
 
   if ( p_width != width || p_height != height || p_colours != colours || p_subpixelorder != subpixelorder ) {
-    newsize = (p_width * p_height) * p_colours;
+    unsigned int newsize = (p_width * p_height) * p_colours;
 
     if ( buffer == NULL ) {
       AllocImgBuffer(newsize);
@@ -613,12 +613,12 @@ void Image::Assign(const unsigned int p_width, const unsigned int p_height, cons
 void Image::Assign( const Image &image ) {
   unsigned int new_size = (image.width * image.height) * image.colours;
 
-  if(image.buffer == NULL) {
+  if ( image.buffer == NULL ) {
     Error("Attempt to assign image with an empty buffer");
     return;
   }
 
-  if(image.colours != ZM_COLOUR_GRAY8 && image.colours != ZM_COLOUR_RGB24 && image.colours != ZM_COLOUR_RGB32) {
+  if ( image.colours != ZM_COLOUR_GRAY8 && image.colours != ZM_COLOUR_RGB24 && image.colours != ZM_COLOUR_RGB32 ) {
     Error("Attempt to assign image with unexpected colours per pixel: %d",image.colours);
     return;
   }
@@ -1848,8 +1848,7 @@ void Image::Delta( const Image &image, Image* targetimage) const
 #endif
 }
 
-const Coord Image::centreCoord( const char *text ) const
-{
+const Coord Image::centreCoord( const char *text ) const {
   int index = 0;
   int line_no = 0;
   int text_len = strlen( text );
@@ -1857,14 +1856,12 @@ const Coord Image::centreCoord( const char *text ) const
   int max_line_len = 0;
   const char *line = text;
 
-  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) )
-  {
+  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) ) {
     if ( line_len > max_line_len )
       max_line_len = line_len;
 
     index += line_len;
-    while ( text[index] == '\n' )
-    {
+    while ( text[index] == '\n' ) {
       index++;
     }
     line = text+index;
@@ -1876,8 +1873,7 @@ const Coord Image::centreCoord( const char *text ) const
 }
 
 /* RGB32 compatible: complete */
-void Image::MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour )
-{
+void Image::MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour ) {
   const uint8_t pixel_r_col = RED_VAL_RGBA(pixel_colour);
   const uint8_t pixel_g_col = GREEN_VAL_RGBA(pixel_colour);
   const uint8_t pixel_b_col = BLUE_VAL_RGBA(pixel_colour);
@@ -2102,8 +2098,8 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
 void Image::Timestamp( const char *label, const time_t when, const Coord &coord, const int size ) {
   char time_text[64];
   strftime( time_text, sizeof(time_text), "%y/%m/%d %H:%M:%S", localtime( &when ) );
-  char text[64];
   if ( label ) {
+    char text[64];
     snprintf( text, sizeof(text), "%s - %s", label, time_text );
     Annotate( text, coord, size );
   } else {
@@ -2625,8 +2621,7 @@ void Image::Rotate( int angle )
   unsigned int new_width = width;
   uint8_t* rotate_buffer = AllocBuffer(size);
 
-  switch( angle )
-  {
+  switch( angle ) {
     case 90 :
       {
         new_height = width;
@@ -2635,41 +2630,27 @@ void Image::Rotate( int angle )
         unsigned int line_bytes = new_width*colours;
         unsigned char *s_ptr = buffer;
 
-        if ( colours == ZM_COLOUR_GRAY8 )
-        {
-          unsigned char *d_ptr;
-          for ( unsigned int i = new_width; i > 0; i-- )
-          {
-            d_ptr = rotate_buffer+(i-1);
-            for ( unsigned int j = new_height; j > 0; j-- )
-            {
+        if ( colours == ZM_COLOUR_GRAY8 ) {
+          for ( unsigned int i = new_width; i > 0; i-- ) {
+            unsigned char *d_ptr = rotate_buffer+(i-1);
+            for ( unsigned int j = new_height; j > 0; j-- ) {
               *d_ptr = *s_ptr++;
               d_ptr += line_bytes;
             }
           }
-        }
-        else if ( colours == ZM_COLOUR_RGB32 )
-        {
+        } else if ( colours == ZM_COLOUR_RGB32 ) {
           Rgb* s_rptr = (Rgb*)s_ptr;
-          Rgb* d_rptr;
-          for ( unsigned int i = new_width; i > 0; i-- )
-          {
-            d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
-            for ( unsigned int j = new_height; j > 0; j-- )
-            {
+          for ( unsigned int i = new_width; i > 0; i-- ) {
+            Rgb* d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
+            for ( unsigned int j = new_height; j > 0; j-- ) {
               *d_rptr = *s_rptr++;
               d_rptr += new_width;
             }
           }
-        }
-        else /* Assume RGB24 */
-        {
-          unsigned char *d_ptr;
-          for ( unsigned int i = new_width; i > 0; i-- )
-          {
-            d_ptr = rotate_buffer+((i-1)*3);
-            for ( unsigned int j = new_height; j > 0; j-- )
-            {
+        } else /* Assume RGB24 */ {
+          for ( unsigned int i = new_width; i > 0; i-- ) {
+            unsigned char *d_ptr = rotate_buffer+((i-1)*3);
+            for ( unsigned int j = new_height; j > 0; j-- ) {
               *d_ptr = *s_ptr++;
               *(d_ptr+1) = *s_ptr++;
               *(d_ptr+2) = *s_ptr++;
@@ -2684,28 +2665,20 @@ void Image::Rotate( int angle )
         unsigned char *s_ptr = buffer+size;
         unsigned char *d_ptr = rotate_buffer;
 
-        if ( colours == ZM_COLOUR_GRAY8 )
-        {
-          while( s_ptr > buffer )
-          {
+        if ( colours == ZM_COLOUR_GRAY8 ) {
+          while( s_ptr > buffer ) {
             s_ptr--;
             *d_ptr++ = *s_ptr;
           }
-        }
-        else if ( colours == ZM_COLOUR_RGB32 )
-        {
+        } else if ( colours == ZM_COLOUR_RGB32 ) {
           Rgb* s_rptr = (Rgb*)s_ptr;
           Rgb* d_rptr = (Rgb*)d_ptr;
-          while( s_rptr > (Rgb*)buffer )
-          {
+          while( s_rptr > (Rgb*)buffer ) {
             s_rptr--;
             *d_rptr++ = *s_rptr;
           }
-        }
-        else /* Assume RGB24 */
-        {
-          while( s_ptr > buffer )
-          {
+        } else /* Assume RGB24 */ {
+          while( s_ptr > buffer ) {
             s_ptr -= 3;
             *d_ptr++ = *s_ptr;
             *d_ptr++ = *(s_ptr+1);
@@ -2722,43 +2695,29 @@ void Image::Rotate( int angle )
         unsigned int line_bytes = new_width*colours;
         unsigned char *s_ptr = buffer+size;
 
-        if ( colours == ZM_COLOUR_GRAY8 )
-        {
-          unsigned char *d_ptr;
-          for ( unsigned int i = new_width; i > 0; i-- )
-          {
-            d_ptr = rotate_buffer+(i-1);
-            for ( unsigned int j = new_height; j > 0; j-- )
-            {
+        if ( colours == ZM_COLOUR_GRAY8 ) {
+          for ( unsigned int i = new_width; i > 0; i-- ) {
+            unsigned char *d_ptr = rotate_buffer+(i-1);
+            for ( unsigned int j = new_height; j > 0; j-- ) {
               s_ptr--;
               *d_ptr = *s_ptr;
               d_ptr += line_bytes;
             }
           }
-        }
-        else if ( colours == ZM_COLOUR_RGB32 )
-        {
+        } else if ( colours == ZM_COLOUR_RGB32 ) {
           Rgb* s_rptr = (Rgb*)s_ptr;
-          Rgb* d_rptr;
-          for ( unsigned int i = new_width; i > 0; i-- )
-          {
-            d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
-            for ( unsigned int j = new_height; j > 0; j-- )
-            {
+          for ( unsigned int i = new_width; i > 0; i-- ) {
+            Rgb* d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
+            for ( unsigned int j = new_height; j > 0; j-- ) {
               s_rptr--;
               *d_rptr = *s_rptr;
               d_rptr += new_width;
             }
           }
-        }
-        else /* Assume RGB24 */
-        {
-          unsigned char *d_ptr;
-          for ( unsigned int i = new_width; i > 0; i-- )
-          {
-            d_ptr = rotate_buffer+((i-1)*3);
-            for ( unsigned int j = new_height; j > 0; j-- )
-            {
+        } else /* Assume RGB24 */ {
+          for ( unsigned int i = new_width; i > 0; i-- ) {
+            unsigned char *d_ptr = rotate_buffer+((i-1)*3);
+            for ( unsigned int j = new_height; j > 0; j-- ) {
               *(d_ptr+2) = *(--s_ptr);
               *(d_ptr+1) = *(--s_ptr);
               *d_ptr = *(--s_ptr);
@@ -2771,18 +2730,15 @@ void Image::Rotate( int angle )
   }
 
   AssignDirect( new_width, new_height, colours, subpixelorder, rotate_buffer, size, ZM_BUFTYPE_ZM);
-
 }
 
 /* RGB32 compatible: complete */
-void Image::Flip( bool leftright )
-{
+void Image::Flip( bool leftright ) {
   uint8_t* flip_buffer = AllocBuffer(size);
 
   unsigned int line_bytes = width*colours;
   unsigned int line_bytes2 = 2*line_bytes;
-  if ( leftright )
-  {
+  if ( leftright ) {
     // Horizontal flip, left to right
     unsigned char *s_ptr = buffer+line_bytes;
     unsigned char *d_ptr = flip_buffer;
diff --git a/src/zm_image.h b/src/zm_image.h
index 934d2a682..104ccdcdc 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -95,14 +95,14 @@ protected:
 		double _1_m;
 
 		static int CompareYX( const void *p1, const void *p2 ) {
-			const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
+			const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
 			if ( e1->min_y == e2->min_y )
 				return( int(e1->min_x - e2->min_x) );
 			else
 				return( int(e1->min_y - e2->min_y) );
 		}
 		static int CompareX( const void *p1, const void *p2 ) {
-			const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
+			const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
 			return( int(e1->min_x - e2->min_x) );
 		}
 	};
@@ -152,10 +152,10 @@ protected:
 
 public:
 	Image();
-	Image( const char *filename );
+	explicit Image( const char *filename );
 	Image( int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0);
-	Image( const Image &p_image );
-  Image( const AVFrame *frame );
+	explicit Image( const Image &p_image );
+  explicit Image( const AVFrame *frame );
 	~Image();
 	static void Initialise();
 	static void Deinitialise();
diff --git a/src/zm_jpeg.cpp b/src/zm_jpeg.cpp
index ba0085c6b..cddf086c5 100644
--- a/src/zm_jpeg.cpp
+++ b/src/zm_jpeg.cpp
@@ -276,8 +276,7 @@ static boolean fill_input_buffer (j_decompress_ptr cinfo)
   memcpy( src->buffer, src->inbuffer, (size_t) src->inbuffer_size );
   nbytes = src->inbuffer_size;
 
-  if ( nbytes <= 0 )
-  {
+  if ( nbytes == 0 ) {
     if ( src->start_of_data )  /* Treat empty input file as fatal error */
       ERREXIT(cinfo, JERR_INPUT_EMPTY);
     WARNMS(cinfo, JWRN_JPEG_EOF);
diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp
index 70d833c31..9779fb024 100644
--- a/src/zm_libvlc_camera.cpp
+++ b/src/zm_libvlc_camera.cpp
@@ -24,7 +24,7 @@
 
 // Do all the buffer checking work here to avoid unnecessary locking 
 void* LibvlcLockBuffer(void* opaque, void** planes) {
-  LibvlcPrivateData* data = (LibvlcPrivateData*)opaque;
+  LibvlcPrivateData* data = reinterpret_cast<LibvlcPrivateData*>(opaque);
   data->mutex.lock();
 
   uint8_t* buffer = data->buffer;
@@ -36,7 +36,7 @@ void* LibvlcLockBuffer(void* opaque, void** planes) {
 }
 
 void LibvlcUnlockBuffer(void* opaque, void* picture, void *const *planes) {
-  LibvlcPrivateData* data = (LibvlcPrivateData*)opaque;
+  LibvlcPrivateData* data = reinterpret_cast<LibvlcPrivateData*>(opaque);
 
   bool newFrame = false;
   for( uint32_t i = 0; i < data->bufferSize; i++ ) {
@@ -67,6 +67,7 @@ LibvlcCamera::LibvlcCamera( int p_id, const std::string &p_path, const std::stri
   mLibvlcMediaPlayer = NULL;
   mLibvlcData.buffer = NULL;
   mLibvlcData.prevBuffer = NULL;
+  mOptArgV = NULL;
 
   /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
   if(colours == ZM_COLOUR_RGB32) {
diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp
index e6bc1a405..76f79fd58 100644
--- a/src/zm_local_camera.cpp
+++ b/src/zm_local_camera.cpp
@@ -1534,34 +1534,28 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           return( false );
         }
 
-        if ( verbose )
-        {
+        if ( verbose ) {
           sprintf( output+strlen(output), "  Input %d\n", input.index );
           sprintf( output+strlen(output), "    Name: %s\n", input.name );
           sprintf( output+strlen(output), "    Type: %s\n", input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
           sprintf( output+strlen(output), "    Audioset: %08x\n", input.audioset );
           sprintf( output+strlen(output), "    Standards: 0x%llx\n", input.std );
-        }
-        else
-        {
+        } else {
           sprintf( output+strlen(output), "i%d:%s|", input.index, input.name );
           sprintf( output+strlen(output), "i%dT:%s|", input.index, input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
           sprintf( output+strlen(output), "i%dS:%llx|", input.index, input.std );
         }
 
-        if ( verbose )
-        {
+        if ( verbose ) {
           sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_POWER, "Power ", "off", "on", " (X)" ) );
           sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_SIGNAL, "Signal ", "not detected", "detected", " (X)" ) );
           sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_COLOR, "Colour Signal ", "not detected", "detected", "" ) );
           sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_H_LOCK, "Horizontal Lock ", "not detected", "detected", "" ) );
-        }
-        else
-        {
-          sprintf( output+strlen(output), "i%dSP:%d|", input.index, input.status&V4L2_IN_ST_NO_POWER?0:1 );
-          sprintf( output+strlen(output), "i%dSS:%d|", input.index, input.status&V4L2_IN_ST_NO_SIGNAL?0:1 );
-          sprintf( output+strlen(output), "i%dSC:%d|", input.index, input.status&V4L2_IN_ST_NO_COLOR?0:1 );
-          sprintf( output+strlen(output), "i%dHP:%d|", input.index, input.status&V4L2_IN_ST_NO_H_LOCK?0:1 );
+        } else {
+          sprintf( output+strlen(output), "i%dSP:%d|", input.index, (input.status&V4L2_IN_ST_NO_POWER)?0:1 );
+          sprintf( output+strlen(output), "i%dSS:%d|", input.index, (input.status&V4L2_IN_ST_NO_SIGNAL)?0:1 );
+          sprintf( output+strlen(output), "i%dSC:%d|", input.index, (input.status&V4L2_IN_ST_NO_COLOR)?0:1 );
+          sprintf( output+strlen(output), "i%dHP:%d|", input.index, (input.status&V4L2_IN_ST_NO_H_LOCK)?0:1 );
         }
       }
       while ( inputIndex++ >= 0 );
@@ -1570,12 +1564,10 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
     }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-    if ( version == 1 )
-    {
+    if ( version == 1 ) {
       struct video_capability vid_cap;
       memset( &vid_cap, 0, sizeof(video_capability) );
-      if ( ioctl( vid_fd, VIDIOCGCAP, &vid_cap ) < 0 )
-      {
+      if ( ioctl( vid_fd, VIDIOCGCAP, &vid_cap ) < 0 ) {
         Error( "Failed to get video capabilities: %s", strerror(errno) );
         if ( verbose )
           sprintf( output, "Error, failed to get video capabilities %s: %s\n", queryDevice, strerror(errno) );
@@ -1583,25 +1575,24 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           sprintf( output, "error%d\n", errno );
         return( false );
       }
-      if ( verbose )
-      {
+      if ( verbose ) {
         sprintf( output+strlen(output), "Video Capabilities\n" );
         sprintf( output+strlen(output), "  Name: %s\n", vid_cap.name );
         sprintf( output+strlen(output), "  Type: %d\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s", vid_cap.type,
-            vid_cap.type&VID_TYPE_CAPTURE?"    Can capture\n":"",
-            vid_cap.type&VID_TYPE_TUNER?"    Can tune\n":"",
-            vid_cap.type&VID_TYPE_TELETEXT?"    Does teletext\n":"",
-            vid_cap.type&VID_TYPE_OVERLAY?"    Overlay onto frame buffer\n":"",
-            vid_cap.type&VID_TYPE_CHROMAKEY?"    Overlay by chromakey\n":"",
-            vid_cap.type&VID_TYPE_CLIPPING?"    Can clip\n":"",
-            vid_cap.type&VID_TYPE_FRAMERAM?"    Uses the frame buffer memory\n":"",
-            vid_cap.type&VID_TYPE_SCALES?"    Scalable\n":"",
-            vid_cap.type&VID_TYPE_MONOCHROME?"    Monochrome only\n":"",
-            vid_cap.type&VID_TYPE_SUBCAPTURE?"    Can capture subareas of the image\n":"",
-            vid_cap.type&VID_TYPE_MPEG_DECODER?"    Can decode MPEG streams\n":"",
-            vid_cap.type&VID_TYPE_MPEG_ENCODER?"    Can encode MPEG streams\n":"",
-            vid_cap.type&VID_TYPE_MJPEG_DECODER?"    Can decode MJPEG streams\n":"",
-            vid_cap.type&VID_TYPE_MJPEG_ENCODER?"    Can encode MJPEG streams\n":""
+            (vid_cap.type&VID_TYPE_CAPTURE)?"    Can capture\n":"",
+            (vid_cap.type&VID_TYPE_TUNER)?"    Can tune\n":"",
+            (vid_cap.type&VID_TYPE_TELETEXT)?"    Does teletext\n":"",
+            (vid_cap.type&VID_TYPE_OVERLAY)?"    Overlay onto frame buffer\n":"",
+            (vid_cap.type&VID_TYPE_CHROMAKEY)?"    Overlay by chromakey\n":"",
+            (vid_cap.type&VID_TYPE_CLIPPING)?"    Can clip\n":"",
+            (vid_cap.type&VID_TYPE_FRAMERAM)?"    Uses the frame buffer memory\n":"",
+            (vid_cap.type&VID_TYPE_SCALES)?"    Scalable\n":"",
+            (vid_cap.type&VID_TYPE_MONOCHROME)?"    Monochrome only\n":"",
+            (vid_cap.type&VID_TYPE_SUBCAPTURE)?"    Can capture subareas of the image\n":"",
+            (vid_cap.type&VID_TYPE_MPEG_DECODER)?"    Can decode MPEG streams\n":"",
+            (vid_cap.type&VID_TYPE_MPEG_ENCODER)?"    Can encode MPEG streams\n":"",
+            (vid_cap.type&VID_TYPE_MJPEG_DECODER)?"    Can decode MJPEG streams\n":"",
+            (vid_cap.type&VID_TYPE_MJPEG_ENCODER)?"    Can encode MJPEG streams\n":""
             );
         sprintf( output+strlen(output), "  Video Channels: %d\n", vid_cap.channels );
         sprintf( output+strlen(output), "  Audio Channels: %d\n", vid_cap.audios );
@@ -1721,8 +1712,8 @@ bool LocalCamera::GetCurrentSettings( const char *device, char *output, int vers
           sprintf( output+strlen(output), "  Name: %s\n", vid_src.name );
           sprintf( output+strlen(output), "  Channel: %d\n", vid_src.channel );
           sprintf( output+strlen(output), "  Flags: %d\n%s%s", vid_src.flags,
-              vid_src.flags&VIDEO_VC_TUNER?"    Channel has a tuner\n":"",
-              vid_src.flags&VIDEO_VC_AUDIO?"    Channel has audio\n":""
+              (vid_src.flags&VIDEO_VC_TUNER)?"    Channel has a tuner\n":"",
+              (vid_src.flags&VIDEO_VC_AUDIO)?"    Channel has audio\n":""
               );
           sprintf( output+strlen(output), "  Type: %d - %s\n", vid_src.type,
               vid_src.type==VIDEO_TYPE_TV?"TV":(
@@ -2047,9 +2038,8 @@ int LocalCamera::PreCapture() {
 int LocalCamera::Capture( Image &image ) {
   Debug( 3, "Capturing" );
   static uint8_t* buffer = NULL;
-  static uint8_t* directbuffer = NULL;
-  static int capture_frame = -1;
   int buffer_bytesused = 0;
+  int capture_frame = -1;
 
   int captures_per_frame = 1;
   if ( channel_count > 1 )
@@ -2059,7 +2049,6 @@ int LocalCamera::Capture( Image &image ) {
     Warning( "Invalid Captures Per Frame setting: %d", captures_per_frame );
   } 
 
-
   // Do the capture, unless we are the second or subsequent camera on a channel, in which case just reuse the buffer
   if ( channel_prime ) {
 #if ZM_HAS_V4L2
@@ -2135,7 +2124,7 @@ int LocalCamera::Capture( Image &image ) {
     Debug( 3, "Performing format conversion" );
 
     /* Request a writeable buffer of the target image */
-    directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
+    uint8_t* directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
     if ( directbuffer == NULL ) {
       Error("Failed requesting writeable buffer for the captured image.");
       return -1;
@@ -2153,7 +2142,13 @@ int LocalCamera::Capture( Image &image ) {
       avpicture_fill( (AVPicture *)tmpPicture, directbuffer,
           imagePixFormat, width, height );
 #endif
-      sws_scale( imgConversionContext, capturePictures[capture_frame]->data, capturePictures[capture_frame]->linesize, 0, height, tmpPicture->data, tmpPicture->linesize );
+      sws_scale( imgConversionContext,
+          capturePictures[capture_frame]->data,
+          capturePictures[capture_frame]->linesize,
+          0,
+          height,
+          tmpPicture->data,
+          tmpPicture->linesize );
     }
 #endif  
     if ( conversion_type == 2 ) {
@@ -2174,11 +2169,11 @@ int LocalCamera::Capture( Image &image ) {
   }
 
   return 1;
-}
+} // end int LocalCamera::Capture()
 
 int LocalCamera::PostCapture()
 {
-  Debug( 2, "Post-capturing" );
+  Debug( 4, "Post-capturing" );
   // Requeue the buffer unless we need to switch or are a duplicate camera on a channel
   if ( channel_count > 1 || channel_prime )
   {
diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index d01e269c9..9c8efd456 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -184,7 +184,7 @@ void Logger::initialise( const std::string &id, const Options &options ) {
     StringVector targets = split( config.log_debug_target, "|" );
     for ( unsigned int i = 0; i < targets.size(); i++ ) {
       const std::string &target = targets[i];
-      if ( target == mId || target == "_"+mId || target == "_"+mIdRoot || target == "_"+mIdRoot || target == "" ) {
+      if ( target == mId || target == "_"+mId || target == "_"+mIdRoot || target == "" ) {
         if ( config.log_debug_level > NOLOG ) {
           tempLevel = config.log_debug_level;
           if ( config.log_debug_file[0] ) {
@@ -277,11 +277,10 @@ std::string Logger::strEnv( const std::string &name, const std::string &defaultV
 }
 
 char *Logger::getTargettedEnv( const std::string &name ) {
-  char *envPtr = NULL;
   std::string envName;
 
   envName = name+"_"+mId;
-  envPtr = getenv( envName.c_str() );
+  char *envPtr = getenv( envName.c_str() );
   if ( !envPtr && mId != mIdRoot ) {
     envName = name+"_"+mIdRoot;
     envPtr = getenv( envName.c_str() );
diff --git a/src/zm_mem_utils.h b/src/zm_mem_utils.h
index dd0e2a3f9..50809016c 100644
--- a/src/zm_mem_utils.h
+++ b/src/zm_mem_utils.h
@@ -26,7 +26,7 @@
 inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) {
   uint8_t* retptr;
 #if HAVE_POSIX_MEMALIGN
-  if(posix_memalign((void**)&retptr,reqalignment,reqsize) != 0)
+  if ( posix_memalign((void**)&retptr,reqalignment,reqsize) != 0 )
     return NULL;
   
   return retptr;
@@ -34,7 +34,7 @@ inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) {
   uint8_t* alloc;
   retptr = (uint8_t*)malloc(reqsize+reqalignment+sizeof(void*));
   
-  if(retptr == NULL)
+  if ( retptr == NULL )
     return NULL;
   
   alloc = retptr + sizeof(void*);
@@ -58,20 +58,16 @@ inline void zm_freealigned(void* ptr) {
 #endif
 }
 
-inline char *mempbrk( register const char *s, const char *accept, size_t limit )
-{
-  if ( limit <= 0 || !s || !accept || !*accept )
-    return( 0 );
+inline char *mempbrk( register const char *s, const char *accept, size_t limit ) {
+  if ( limit == 0 || !s || !accept || !*accept )
+    return 0;
 
   register unsigned int i,j;
   size_t acc_len = strlen( accept );
 
-  for ( i = 0; i < limit; s++, i++ )
-  {
-    for ( j = 0; j < acc_len; j++ )
-    {
-      if ( *s == accept[j] )
-      {
+  for ( i = 0; i < limit; s++, i++ ) {
+    for ( j = 0; j < acc_len; j++ ) {
+      if ( *s == accept[j] ) {
         return( (char *)s );
       }
     }
@@ -79,9 +75,8 @@ inline char *mempbrk( register const char *s, const char *accept, size_t limit )
   return( 0 );
 }
 
-inline char *memstr( register const char *s, const char *n, size_t limit )
-{
-  if ( limit <= 0 || !s || !n )
+inline char *memstr( register const char *s, const char *n, size_t limit ) {
+  if ( limit == 0 || !s || !n )
     return( 0 );
 
   if ( !*n )
@@ -90,14 +85,12 @@ inline char *memstr( register const char *s, const char *n, size_t limit )
   register unsigned int i,j,k;
   size_t n_len = strlen( n );
 
-  for ( i = 0; i < limit; i++, s++ )
-  {
+  for ( i = 0; i < limit; i++, s++ ) {
     if ( *s != *n )
       continue;
     j = 1;
     k = 1;
-    while ( true )
-    {
+    while ( true ) {
       if ( k >= n_len )
         return( (char *)s );
       if ( s[j++] != n[k++] )
@@ -107,36 +100,30 @@ inline char *memstr( register const char *s, const char *n, size_t limit )
   return( 0 );
 }
 
-inline size_t memspn( register const char *s, const char *accept, size_t limit )
-{
-  if ( limit <= 0 || !s || !accept || !*accept )
+inline size_t memspn( register const char *s, const char *accept, size_t limit ) {
+  if ( limit == 0 || !s || !accept || !*accept )
     return( 0 );
 
   register unsigned int i,j;
   size_t acc_len = strlen( accept );
 
-  for ( i = 0; i < limit; s++, i++ )
-  {
+  for ( i = 0; i < limit; s++, i++ ) {
     register bool found = false;
-    for ( j = 0; j < acc_len; j++ )
-    {
-      if ( *s == accept[j] )
-      {
+    for ( j = 0; j < acc_len; j++ ) {
+      if ( *s == accept[j] ) {
         found = true;
         break;
       }
     }
-    if ( !found )
-    {
+    if ( !found ) {
       return( i );
     }
   }
   return( limit );
 }
 
-inline size_t memcspn( register const char *s, const char *reject, size_t limit )
-{
-  if ( limit <= 0 || !s || !reject )
+inline size_t memcspn( register const char *s, const char *reject, size_t limit ) {
+  if ( limit == 0 || !s || !reject )
     return( 0 );
 
   if ( !*reject )
@@ -145,12 +132,9 @@ inline size_t memcspn( register const char *s, const char *reject, size_t limit
   register unsigned int i,j;
   size_t rej_len = strlen( reject );
 
-  for ( i = 0; i < limit; s++, i++ )
-  {
-    for ( j = 0; j < rej_len; j++ )
-    {
-      if ( *s == reject[j] )
-      {
+  for ( i = 0; i < limit; s++, i++ ) {
+    for ( j = 0; j < rej_len; j++ ) {
+      if ( *s == reject[j] ) {
         return( i );
       }
     }
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 7e0d4b630..4933bd0fc 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2974,26 +2974,24 @@ Debug(4, "Return from Capture (%d)", captureResult);
     shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
 
     image_count++;
-  } // end if captureResult
 
-  if ( image_count && fps_report_interval && !(image_count%fps_report_interval) ) {
-
-    struct timeval now;
-    if ( !captureResult ) {
-      gettimeofday( &now, NULL );
-    } else {
-      now.tv_sec = image_buffer[index].timestamp->tv_sec;
-    }
-    fps = double(fps_report_interval)/(now.tv_sec-last_fps_time);
-    Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time );
-    //Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps );
-    Info( "%s: %d - Capturing at %.2lf fps", name, image_count, fps );
-    last_fps_time = now.tv_sec;
-    static char sql[ZM_SQL_SML_BUFSIZ];
-    snprintf( sql, sizeof(sql), "UPDATE Monitors SET CaptureFPS='%.2lf' WHERE Id=%d", fps, id );
-    if ( mysql_query( &dbconn, sql ) ) {
-      Error( "Can't run query: %s", mysql_error( &dbconn ) );
-    }
+    if ( image_count && fps_report_interval && !(image_count%fps_report_interval) ) {
+      time_t now = image_buffer[index].timestamp->tv_sec;
+      // If we are too fast, we get div by zero. This seems to happen in the case of audio packets.
+      if ( now != last_fps_time ) {
+        // # of images per interval / the amount of time it took
+        fps = double(fps_report_interval)/(now-last_fps_time);
+        Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time );
+        //Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps );
+        Info( "%s: %d - Capturing at %.2lf fps", name, image_count, fps );
+        last_fps_time = now;
+        static char sql[ZM_SQL_SML_BUFSIZ];
+        snprintf( sql, sizeof(sql), "UPDATE Monitors SET CaptureFPS='%.2lf' WHERE Id=%d", fps, id );
+        if ( mysql_query( &dbconn, sql ) ) {
+          Error( "Can't run query: %s", mysql_error( &dbconn ) );
+        }
+      }
+    } // end if captureResult
   }
 
   // Icon: I'm not sure these should be here. They have nothing to do with capturing
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 925e0d14a..780c10b7c 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -330,7 +330,7 @@ protected:
   MonitorLink    **linked_monitors;
 
 public:
-  Monitor( int p_id );
+  explicit Monitor( int p_id );
 
 // OurCheckAlarms seems to be unused. Check it on zm_monitor.cpp for more info.
 //bool OurCheckAlarms( Zone *zone, const Image *pImage );
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 010877b90..ed8009f84 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -498,7 +498,8 @@ void MonitorStream::runStream() {
   if ( type == STREAM_JPEG )
     fprintf( stdout, "Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n" );
 
-  int last_read_index = monitor->image_buffer_count;
+  // point to end which is theoretically not a valid value because all indexes are % image_buffer_count
+  unsigned int last_read_index = monitor->image_buffer_count; 
 
   time_t stream_start_time;
   time( &stream_start_time );
@@ -557,6 +558,8 @@ void MonitorStream::runStream() {
         Debug( 2, "Assigned temporary buffer" );
       }
     }
+  } else {
+    Debug(2, "Not using playback_buffer");
   } // end if connkey  & playback_buffer
 
   float max_secs_since_last_sent_frame = 10.0; //should be > keep alive amount (5 secs)
@@ -576,7 +579,7 @@ void MonitorStream::runStream() {
     gettimeofday( &now, NULL );
 
     if ( connkey ) {
-//Debug(2, "checking command Queue for connkey: %d", connkey );
+Debug(2, "checking command Queue for connkey: %d", connkey );
       while(checkCommandQueue()) {
 Debug(2, "Have checking command Queue for connkey: %d", connkey );
         got_command = true;
@@ -657,26 +660,29 @@ Debug(2, "Have checking command Queue for connkey: %d", connkey );
         delayed = false;
         replay_rate = ZM_RATE_BASE;
       }
-    }
-    if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index ) {
-      int index = monitor->shared_data->last_write_index%monitor->image_buffer_count;
+    } // end if ( buffered_playback && delayed )
+    if ( last_read_index != monitor->shared_data->last_write_index ) {
+      int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; // % shouldn't be neccessary
       last_read_index = monitor->shared_data->last_write_index;
-      //Debug( 1, "%d: %x - %x", index, image_buffer[index].image, image_buffer[index].image->buffer );
+      Debug( 1, "index: %d: frame_mod: %d frame count: %d", index, frame_mod, frame_count );
       if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) ) {
         if ( !paused && !delayed ) {
           // Send the next frame
           Monitor::Snapshot *snap = &monitor->image_buffer[index];
 
+            //Debug(2, "sending Frame.");
           if ( !sendFrame( snap->image, snap->timestamp ) ) {
             Debug(2, "sendFrame failed, quiting.");
             zm_terminate = true;
           }
+          // Perhaps we should use NOW instead. 
           memcpy( &last_frame_timestamp, snap->timestamp, sizeof(last_frame_timestamp) );
           //frame_sent = true;
 
           temp_read_index = temp_write_index;
         }
-      }
+      } // end if should send frame
+
       if ( buffered_playback ) {
         if ( monitor->shared_data->valid ) {
           if ( monitor->image_buffer[index].timestamp->tv_sec ) {
@@ -706,21 +712,29 @@ Debug(2, "Have checking command Queue for connkey: %d", connkey );
         }
       } // end if buffered playback
       frame_count++;
-    }
+    } else {
+      Debug(2,"Waiting for capture");
+    } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index ) 
+
     unsigned long sleep_time = (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2)));
     Debug(2, "Sleeping for (%d)", sleep_time);
-    usleep( (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))) );
+    usleep( sleep_time );
     if ( ttl ) {
       if ( (now.tv_sec - stream_start_time) > ttl ) {
         Debug(2, "now(%d) - start(%d) > ttl(%d) break", now.tv_sec, stream_start_time, ttl);
         break;
       }
     }
-    if ( (TV_2_FLOAT( now ) - last_frame_sent) > max_secs_since_last_sent_frame ) {
+    if ( ! last_frame_sent ) {
+      // If we didn't capture above, because frame_mod was bad? Then last_frame_sent will not have a value.
+      last_frame_sent = now.tv_sec;
+      Warning( "no last_frame_sent.  Shouldn't happen. frame_mod was (%d) frame_count (%d) ", frame_mod, frame_count );
+    } else if ( (TV_2_FLOAT( now ) - last_frame_sent) > max_secs_since_last_sent_frame ) {
       Error( "Terminating, last frame sent time %f secs more than maximum of %f", TV_2_FLOAT( now ) - last_frame_sent, max_secs_since_last_sent_frame );
       break;
     }
   } // end while
+
   if ( buffered_playback ) {
     Debug( 1, "Cleaning swap files from %s", swap_path );
     struct stat stat_buf;
diff --git a/src/zm_monitorstream.h b/src/zm_monitorstream.h
index fb8e22a13..3e2dfbb1f 100644
--- a/src/zm_monitorstream.h
+++ b/src/zm_monitorstream.h
@@ -55,9 +55,9 @@ class MonitorStream : public StreamBase {
     bool sendFrame( const char *filepath, struct timeval *timestamp );
     bool sendFrame( Image *image, struct timeval *timestamp );
     void processCommand( const CmdMsg *msg );
-  void SingleImage( int scale=100 );
-  void SingleImageRaw( int scale=100 );
-  void SingleImageZip( int scale=100 );
+    void SingleImage( int scale=100 );
+    void SingleImageRaw( int scale=100 );
+    void SingleImageZip( int scale=100 );
 
   public:
     MonitorStream() : playback_buffer( 0 ), delayed( false ), frame_count( 0 ) {
diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
index e949052dc..0280c7f23 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@@ -62,6 +62,7 @@ void VideoStream::SetupFormat( ) {
 	AVFormatContext *s= avformat_alloc_context();
 	if(!s) {
 		Fatal( "avformat_alloc_context failed %d \"%s\"", (size_t)ofc, av_err2str((size_t)ofc) );
+    return;
 	}
 
 	AVOutputFormat *oformat;
@@ -88,7 +89,7 @@ void VideoStream::SetupFormat( ) {
 	
 	if (s->oformat->priv_data_size > 0) {
 		s->priv_data = av_mallocz(s->oformat->priv_data_size);
-		if (!s->priv_data) {
+		if ( !(s->priv_data) ) {
 			Fatal( "Could not allocate private data for output format." );
 		}
 #if LIBAVFORMAT_VERSION_CHECK(52, 92, 0, 92, 0)
@@ -211,39 +212,52 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 
 		Debug( 1, "Allocated stream" );
 
-		AVCodecContext *c = ost->codec;
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  codec_context = avcodec_alloc_context3(NULL);
+  avcodec_parameters_to_context(codec_context, ost->codecpar);
+#else
+		codec_context = ost->codec;
+#endif
 
-		c->codec_id = codec->id;
-		c->codec_type = codec->type;
+		codec_context->codec_id = codec->id;
+		codec_context->codec_type = codec->type;
 
-		c->pix_fmt = strcmp( "mjpeg", ofc->oformat->name ) == 0 ? AV_PIX_FMT_YUVJ422P : AV_PIX_FMT_YUV420P;
+		codec_context->pix_fmt = strcmp( "mjpeg", ofc->oformat->name ) == 0 ? AV_PIX_FMT_YUVJ422P : AV_PIX_FMT_YUV420P;
 		if ( bitrate <= 100 ) {
 			// Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
 			// This gets rid of artifacts in the beginning of the movie; and well, even quality.
-			c->flags |= CODEC_FLAG_QSCALE;
-			c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+			codec_context->flags |= AV_CODEC_FLAG_QSCALE;
+#else
+			codec_context->flags |= CODEC_FLAG_QSCALE;
+#endif
+			codec_context->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
 		} else {
-			c->bit_rate = bitrate;
+			codec_context->bit_rate = bitrate;
 		}
 
 		/* resolution must be a multiple of two */
-		c->width = width;
-		c->height = height;
+		codec_context->width = width;
+		codec_context->height = height;
 		/* time base: this is the fundamental unit of time (in seconds) in terms
 		   of which frame timestamps are represented. for fixed-fps content,
 		   timebase should be 1/framerate and timestamp increments should be
 		   identically 1. */
-		c->time_base.den = frame_rate;
-		c->time_base.num = 1;
+		codec_context->time_base.den = frame_rate;
+		codec_context->time_base.num = 1;
 		
-		Debug( 1, "Will encode in %d fps.", c->time_base.den );
+		Debug( 1, "Will encode in %d fps.", codec_context->time_base.den );
 		
 		/* emit one intra frame every second */
-		c->gop_size = frame_rate;
+		codec_context->gop_size = frame_rate;
 
 		// some formats want stream headers to be separate
 		if ( of->flags & AVFMT_GLOBALHEADER )
-			c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+			codec_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
+			codec_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
 	} else {
 		Fatal( "of->video_codec == AV_CODEC_ID_NONE" );
 	}
@@ -273,39 +287,33 @@ const char *VideoStream::MimeType( ) const {
 }
 
 void VideoStream::OpenStream( ) {
-	int avRet;
+	int ret;
 
 	/* now that all the parameters are set, we can open the 
 	   video codecs and allocate the necessary encode buffers */
 	if ( ost ) {
-		AVCodecContext *c = ost->codec;
-		
 		/* open the codec */
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-		if ( (avRet = avcodec_open( c, codec )) < 0 )
+		if ( (ret = avcodec_open( codec_context, codec )) < 0 )
 #else
-		if ( (avRet = avcodec_open2( c, codec, 0 )) < 0 )
+		if ( (ret = avcodec_open2( codec_context, codec, 0 )) < 0 )
 #endif
 		{
-			Fatal( "Could not open codec. Error code %d \"%s\"", avRet, av_err2str( avRet ) );
+			Fatal( "Could not open codec. Error code %d \"%s\"", ret, av_err2str(ret) );
 		}
 
 		Debug( 1, "Opened codec" );
 
 		/* allocate the encoded raw picture */
-#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-		opicture = av_frame_alloc( );
-#else
-		opicture = avcodec_alloc_frame( );
-#endif
+		opicture = zm_av_frame_alloc( );
     if ( !opicture ) {
       Panic( "Could not allocate opicture" );
     }
 
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-    int size = av_image_get_buffer_size( c->pix_fmt, c->width, c->height, 1 );
+    int size = av_image_get_buffer_size( codec_context->pix_fmt, codec_context->width, codec_context->height, 1 );
 #else
-    int size = avpicture_get_size( c->pix_fmt, c->width, c->height );
+    int size = avpicture_get_size( codec_context->pix_fmt, codec_context->width, codec_context->height );
 #endif
 
     uint8_t *opicture_buf = (uint8_t *)av_malloc( size );
@@ -315,17 +323,17 @@ void VideoStream::OpenStream( ) {
     }
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
     av_image_fill_arrays(opicture->data, opicture->linesize,
-      opicture_buf, c->pix_fmt, c->width, c->height, 1);
+      opicture_buf, codec_context->pix_fmt, codec_context->width, codec_context->height, 1);
 #else
-    avpicture_fill( (AVPicture *)opicture, opicture_buf, c->pix_fmt,
-      c->width, c->height );
+    avpicture_fill( (AVPicture *)opicture, opicture_buf, codec_context->pix_fmt,
+      codec_context->width, codec_context->height );
 #endif
 
     /* if the output format is not identical to the input format, then a temporary
        picture is needed too. It is then converted to the required
        output format */
     tmp_opicture = NULL;
-    if ( c->pix_fmt != pf ) {
+    if ( codec_context->pix_fmt != pf ) {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
 			tmp_opicture = av_frame_alloc( );
 #else
@@ -335,9 +343,9 @@ void VideoStream::OpenStream( ) {
         Panic( "Could not allocate tmp_opicture" );
       }
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-      int size = av_image_get_buffer_size( pf, c->width, c->height,1 );
+      int size = av_image_get_buffer_size( pf, codec_context->width, codec_context->height,1 );
 #else
-      int size = avpicture_get_size( pf, c->width, c->height );
+      int size = avpicture_get_size( pf, codec_context->width, codec_context->height );
 #endif
       uint8_t *tmp_opicture_buf = (uint8_t *)av_malloc( size );
       if ( !tmp_opicture_buf ) {
@@ -347,17 +355,16 @@ void VideoStream::OpenStream( ) {
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
       av_image_fill_arrays(tmp_opicture->data,
         tmp_opicture->linesize, tmp_opicture_buf, pf,
-        c->width, c->height, 1);
+        codec_context->width, codec_context->height, 1);
 #else
       avpicture_fill( (AVPicture *)tmp_opicture,
-        tmp_opicture_buf, pf, c->width, c->height );
+        tmp_opicture_buf, pf, codec_context->width, codec_context->height );
 #endif
     }
   }
 
   /* open the output file, if needed */
   if ( !(of->flags & AVFMT_NOFILE) ) {
-    int ret;
 #if LIBAVFORMAT_VERSION_CHECK(53, 15, 0, 21, 0)
 		ret = avio_open2( &ofc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL );
 #elif LIBAVFORMAT_VERSION_CHECK(52, 102, 0, 102, 0)
@@ -375,7 +382,12 @@ void VideoStream::OpenStream( ) {
 	}
 
 	video_outbuf = NULL;
+#if LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
+    if (codec_context->codec_type == AVMEDIA_TYPE_VIDEO &&
+       codec_context->codec_id == AV_CODEC_ID_RAWVIDEO) {
+#else
 	if ( !(of->flags & AVFMT_RAWPICTURE) ) {
+#endif
 		/* allocate output buffer */
 		/* XXX: API change will be done */
 		// TODO: Make buffer dynamic.
@@ -393,9 +405,9 @@ void VideoStream::OpenStream( ) {
 #endif
 
 #if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
-    int ret = av_write_header( ofc );
+    ret = av_write_header( ofc );
 #else
-    int ret = avformat_write_header( ofc, NULL );
+    ret = avformat_write_header( ofc, NULL );
 #endif
 
     if ( ret < 0 ) {
@@ -406,9 +418,15 @@ void VideoStream::OpenStream( ) {
 VideoStream::VideoStream( const char *in_filename, const char *in_format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height ) :
 		filename(in_filename),
 		format(in_format),
+    opicture(NULL),
+    tmp_opicture(NULL),
+    video_outbuf(NULL),
+    video_outbuf_size(0),
 		last_pts( -1 ),
 		streaming_thread(0),
 		do_streaming(true),
+    add_timestamp(false),
+    timestamp(0),
 		buffer_copy(NULL),
 		buffer_copy_lock(new pthread_mutex_t),
 		buffer_copy_size(0),
@@ -446,6 +464,8 @@ VideoStream::VideoStream( const char *in_filename, const char *in_format, int bi
 	if ( pthread_mutex_init( buffer_copy_lock, NULL ) != 0 ) {
 		Fatal("pthread_mutex_init failed");
 	}
+
+  codec_context = NULL;
 }
 
 VideoStream::~VideoStream( ) {
@@ -481,7 +501,7 @@ VideoStream::~VideoStream( ) {
 	
 	/* close each codec */
 	if ( ost ) {
-		avcodec_close( ost->codec );
+		avcodec_close( codec_context );
 		av_free( opicture->data[0] );
 		av_frame_free( &opicture );
 		if ( tmp_opicture ) {
@@ -560,21 +580,19 @@ double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool _a
 }
 
 double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp, unsigned int timestamp ) {
+
+	if ( codec_context->pix_fmt != pf ) {
 #ifdef HAVE_LIBSWSCALE
 	static struct SwsContext *img_convert_ctx = 0;
 #endif // HAVE_LIBSWSCALE
-
-	AVCodecContext *c = ost->codec;
-
-	if ( c->pix_fmt != pf ) {
 		memcpy( tmp_opicture->data[0], buffer, buffer_size );
 #ifdef HAVE_LIBSWSCALE
 		if ( !img_convert_ctx ) {
-			img_convert_ctx = sws_getCachedContext( NULL, c->width, c->height, pf, c->width, c->height, c->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL );
+			img_convert_ctx = sws_getCachedContext( NULL, codec_context->width, codec_context->height, pf, codec_context->width, codec_context->height, codec_context->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL );
 			if ( !img_convert_ctx )
 				Panic( "Unable to initialise image scaling context" );
 		}
-		sws_scale( img_convert_ctx, tmp_opicture->data, tmp_opicture->linesize, 0, c->height, opicture->data, opicture->linesize );
+		sws_scale( img_convert_ctx, tmp_opicture->data, tmp_opicture->linesize, 0, codec_context->height, opicture->data, opicture->linesize );
 #else // HAVE_LIBSWSCALE
 		Fatal( "swscale is required for MPEG mode" );
 #endif // HAVE_LIBSWSCALE
@@ -586,7 +604,13 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 	AVPacket *pkt = packet_buffers[packet_index];
 	av_init_packet( pkt );
   int got_packet = 0;
+#if LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0)
+    if (codec_context->codec_type == AVMEDIA_TYPE_VIDEO &&
+       codec_context->codec_id == AV_CODEC_ID_RAWVIDEO) {
+#else
 	if ( of->flags & AVFMT_RAWPICTURE ) {
+#endif
+
 #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
 		pkt->flags |= AV_PKT_FLAG_KEY;
 #else
@@ -597,19 +621,34 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 		pkt->size = sizeof (AVPicture);
     got_packet = 1;
 	} else {
-		opicture_ptr->pts = c->frame_number;
-		opicture_ptr->quality = c->global_quality;
+		opicture_ptr->pts = codec_context->frame_number;
+		opicture_ptr->quality = codec_context->global_quality;
+
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      // Put encoder into flushing mode
+      avcodec_send_frame(codec_context, opicture_ptr);
+      int ret = avcodec_receive_packet(codec_context, pkt);
+      if ( ret < 0 ) {
+        if ( AVERROR_EOF != ret ) {
+          Error("ERror encoding video (%d) (%s)", ret,
+                av_err2str(ret));
+        }
+      } else {
+        got_packet = 1;
+      }
+#else
 
 #if LIBAVFORMAT_VERSION_CHECK(54, 1, 0, 2, 100)
-		int ret = avcodec_encode_video2( c, pkt, opicture_ptr, &got_packet );
+		int ret = avcodec_encode_video2( codec_context, pkt, opicture_ptr, &got_packet );
 		if ( ret != 0 ) {
 			Fatal( "avcodec_encode_video2 failed with errorcode %d \"%s\"", ret, av_err2str( ret ) );
 		}
 #else
-		int out_size = avcodec_encode_video( c, video_outbuf, video_outbuf_size, opicture_ptr );
+		int out_size = avcodec_encode_video( codec_context, video_outbuf, video_outbuf_size, opicture_ptr );
 		got_packet = out_size > 0 ? 1 : 0;
 		pkt->data = got_packet ? video_outbuf : NULL;
 		pkt->size = got_packet ? out_size : 0;
+#endif
 #endif
     if ( got_packet ) {
 //      if ( c->coded_frame->key_frame )
@@ -622,12 +661,12 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 //      }
 
       if ( pkt->pts != (int64_t)AV_NOPTS_VALUE ) {
-        pkt->pts = av_rescale_q( pkt->pts, c->time_base, ost->time_base );
+        pkt->pts = av_rescale_q( pkt->pts, codec_context->time_base, ost->time_base );
       }
       if ( pkt->dts != (int64_t)AV_NOPTS_VALUE ) {
-        pkt->dts = av_rescale_q( pkt->dts, c->time_base, ost->time_base );
+        pkt->dts = av_rescale_q( pkt->dts, codec_context->time_base, ost->time_base );
       }
-      pkt->duration = av_rescale_q( pkt->duration, c->time_base, ost->time_base );
+      pkt->duration = av_rescale_q( pkt->duration, codec_context->time_base, ost->time_base );
       pkt->stream_index = ost->index;
     }
   }
@@ -658,8 +697,12 @@ void *VideoStream::StreamingThreadCallback(void *ctx){
   VideoStream* videoStream = reinterpret_cast<VideoStream*>(ctx);
 
 	const uint64_t nanosecond_multiplier = 1000000000;
-	
-	uint64_t target_interval_ns = nanosecond_multiplier * ( ((double)videoStream->ost->codec->time_base.num) / (videoStream->ost->codec->time_base.den) );
+
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+	uint64_t target_interval_ns = nanosecond_multiplier * ( ((double)videoStream->codec_context->time_base.num) / (videoStream->codec_context->time_base.den) );
+#else
+	uint64_t target_interval_ns = nanosecond_multiplier * ( ((double)videoStream->codec_context->time_base.num) / (videoStream->codec_context->time_base.den) );
+#endif
 	uint64_t frame_count = 0;
 	timespec start_time;
 	clock_gettime(CLOCK_MONOTONIC, &start_time);
diff --git a/src/zm_mpeg.h b/src/zm_mpeg.h
index 931f9d687..fbc3eed4d 100644
--- a/src/zm_mpeg.h
+++ b/src/zm_mpeg.h
@@ -24,11 +24,9 @@
 
 #if HAVE_LIBAVCODEC
 
-class VideoStream
-{
+class VideoStream {
 protected:
-  struct MimeData
-  {
+  struct MimeData {
     const char *format;
     const char *mime_type;
   };
@@ -46,6 +44,7 @@ protected:
   AVOutputFormat *of;
   AVFormatContext *ofc;
   AVStream *ost;
+  AVCodecContext *codec_context;
   AVCodec *codec;
   AVFrame *opicture;
   AVFrame *tmp_opicture;
@@ -55,9 +54,9 @@ protected:
   
   pthread_t streaming_thread;
   bool do_streaming;
-  uint8_t *buffer_copy;
   bool add_timestamp;
   unsigned int timestamp;
+  uint8_t *buffer_copy;
   pthread_mutex_t *buffer_copy_lock;
   int buffer_copy_size;
   int buffer_copy_used;
diff --git a/src/zm_packet.cpp b/src/zm_packet.cpp
index 7c08d4158..a04282d26 100644
--- a/src/zm_packet.cpp
+++ b/src/zm_packet.cpp
@@ -25,6 +25,8 @@
 using namespace std;
 
 ZMPacket::ZMPacket( AVPacket *p ) {
+  frame = NULL;
+  image = NULL;
   av_init_packet( &packet );
   if ( zm_av_packet_ref( &packet, p ) < 0 ) {
     Error("error refing packet");
@@ -33,6 +35,8 @@ ZMPacket::ZMPacket( AVPacket *p ) {
 }
 
 ZMPacket::ZMPacket( AVPacket *p, struct timeval *t ) {
+  frame = NULL;
+  image = NULL;
   av_init_packet( &packet );
   if ( zm_av_packet_ref( &packet, p ) < 0 ) {
     Error("error refing packet");
diff --git a/src/zm_packet.h b/src/zm_packet.h
index 1758b0106..bdb67cb57 100644
--- a/src/zm_packet.h
+++ b/src/zm_packet.h
@@ -39,7 +39,7 @@ class ZMPacket {
   public:
     AVPacket *av_packet() { return &packet; }
     ZMPacket( AVPacket *packet, struct timeval *timestamp );
-    ZMPacket( AVPacket *packet );
+    explicit ZMPacket( AVPacket *packet );
     ~ZMPacket();
 };
 
diff --git a/src/zm_poly.h b/src/zm_poly.h
index 41d7b7c64..0fcf34a6e 100644
--- a/src/zm_poly.h
+++ b/src/zm_poly.h
@@ -39,14 +39,14 @@ protected:
     double _1_m;
 
     static int CompareYX( const void *p1, const void *p2 ) {
-      const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
+        const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
       if ( e1->min_y == e2->min_y )
         return( int(e1->min_x - e2->min_x) );
       else
         return( int(e1->min_y - e2->min_y) );
     }
     static int CompareX( const void *p1, const void *p2 ) {
-      const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
+      const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
       return( int(e1->min_x - e2->min_x) );
     }
   };
diff --git a/src/zm_remote_camera.cpp b/src/zm_remote_camera.cpp
index 6afc7251b..0acd4e709 100644
--- a/src/zm_remote_camera.cpp
+++ b/src/zm_remote_camera.cpp
@@ -42,7 +42,9 @@ RemoteCamera::RemoteCamera(
     host( p_host ),
     port( p_port ),
     path( p_path ),
-    hp( 0 )
+    hp( 0 ),
+    mNeedAuth(false),
+    mAuthenticator(NULL)
 {
     if ( path[0] != '/' )
         path = '/'+path;
@@ -97,13 +99,13 @@ void RemoteCamera::Initialise() {
 
 int RemoteCamera::Read( int fd, char *buf, int size ) {
   int ReceivedBytes = 0;
-  int bytes;
   while ( ReceivedBytes < size ) {
     // recv blocks until we get data, but it may be of ARBITRARY LENGTH and INCOMPLETE
     int bytes_to_recv = size - ReceivedBytes;
     if ( SOCKET_BUF_SIZE < bytes_to_recv ) 
       bytes_to_recv = SOCKET_BUF_SIZE;
-    bytes = recv(fd, &buf[ReceivedBytes], bytes_to_recv, 0); //socket, buffer, len, flags
+//Debug(3, "Aiming to receive %d of %d bytes", bytes_to_recv, size );
+    int bytes = recv(fd, &buf[ReceivedBytes], bytes_to_recv, 0); //socket, buffer, len, flags
     if ( bytes <= 0 ) {
       Error("RemoteCamera::Read Recv error. Closing Socket\n");
       return -1;
diff --git a/src/zm_remote_camera.h b/src/zm_remote_camera.h
index a0d391d9b..32e22c47a 100644
--- a/src/zm_remote_camera.h
+++ b/src/zm_remote_camera.h
@@ -87,7 +87,8 @@ public:
   virtual void Terminate() = 0;
   virtual int Connect() = 0;
   virtual int Disconnect() = 0;
-  virtual int PreCapture() = 0;
+  virtual int PreCapture() { return 0; };
+  virtual int PrimeCapture() { return 0; };
   virtual int Capture( Image &image ) = 0;
   virtual int PostCapture() = 0;
   virtual int CaptureAndRecord( Image &image, timeval recording, char* event_directory )=0;
diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp
index 2907e90a3..f1f3ec427 100644
--- a/src/zm_remote_camera_http.cpp
+++ b/src/zm_remote_camera_http.cpp
@@ -588,10 +588,6 @@ int RemoteCameraHttp::GetResponse()
   else
 #endif // HAVE_LIBPCRE
   {
-    if ( method == REGEXP )
-    {
-      Warning( "Unable to use netcam regexps as not compiled with libpcre" );
-    }
     static const char *http_match = "HTTP/";
     static const char *connection_match = "Connection:";
     static const char *content_length_match = "Content-length:";
diff --git a/src/zm_remote_camera_nvsocket.cpp b/src/zm_remote_camera_nvsocket.cpp
index 78f65bd92..98eff70cd 100644
--- a/src/zm_remote_camera_nvsocket.cpp
+++ b/src/zm_remote_camera_nvsocket.cpp
@@ -67,6 +67,7 @@ RemoteCameraNVSocket::RemoteCameraNVSocket(
 
   timeout.tv_sec = 0;
   timeout.tv_usec = 0;
+  subpixelorder = ZM_SUBPIX_ORDER_BGR;
 
   if ( capture ) {
     Initialise();
@@ -97,43 +98,39 @@ void RemoteCameraNVSocket::Initialise() {
 }
 
 int RemoteCameraNVSocket::Connect() {
+  int port_num = atoi(port.c_str());
   //struct addrinfo *p;
-struct sockaddr_in servaddr;
-    bzero( &servaddr, sizeof(servaddr));
-    servaddr.sin_family      = AF_INET;
-    servaddr.sin_addr.s_addr = htons(INADDR_ANY);
-    servaddr.sin_port        = htons(atoi(port.c_str()));
+  struct sockaddr_in servaddr;
+  bzero( &servaddr, sizeof(servaddr));
+  servaddr.sin_family      = AF_INET;
+  servaddr.sin_addr.s_addr = htons(INADDR_ANY);
+  servaddr.sin_port        = htons(port_num);
 
-
-    sd = socket(AF_INET, SOCK_STREAM, 0);
+  sd = socket(AF_INET, SOCK_STREAM, 0);
   //for(p = hp; p != NULL; p = p->ai_next) {
-    //sd = socket( p->ai_family, p->ai_socktype, p->ai_protocol );
-    if ( sd < 0 ) {
-      Warning("Can't create socket: %s", strerror(errno) );
-      //continue;
-	return -1;
-    }
-
-    //if ( connect( sd, p->ai_addr, p->ai_addrlen ) < 0 ) {
-    if ( connect( sd, (struct sockaddr *)&servaddr , sizeof(servaddr) ) < 0 ) {
-      close(sd);
-      sd = -1;
-
-      Warning("Can't connect to socket mid: %d : %s", monitor_id, strerror(errno) );
-	return -1;
-      //continue;
-    //}
-    /* If we got here, we must have connected successfully */
-    //break;
+  //sd = socket( p->ai_family, p->ai_socktype, p->ai_protocol );
+  if ( sd < 0 ) {
+    Warning("Can't create socket: %s", strerror(errno) );
+    //continue;
+    return -1;
   }
 
-  //if ( p == NULL ) {
-    //Error("Unable to connect to the remote camera, aborting");
-    //return( -1 );
-  //}
+  //if ( connect( sd, p->ai_addr, p->ai_addrlen ) < 0 ) {
+  if ( connect( sd, (struct sockaddr *)&servaddr , sizeof(servaddr) ) < 0 ) {
+    close(sd);
+    sd = -1;
 
-  Debug( 3, "Connected to host, socket = %d", sd );
-  return( sd );
+    Warning("Can't connect to socket mid: %d : %s", monitor_id, strerror(errno) );
+    return -1;
+  }
+
+//if ( p == NULL ) {
+//Error("Unable to connect to the remote camera, aborting");
+//return( -1 );
+//}
+
+  Debug( 3, "Connected to host:%d, socket = %d", port_num, sd );
+  return sd;
 }
 
 int RemoteCameraNVSocket::Disconnect() {
@@ -144,132 +141,33 @@ int RemoteCameraNVSocket::Disconnect() {
 }
 
 int RemoteCameraNVSocket::SendRequest( std::string request ) {
-  Debug( 2, "Sending request: %s", request.c_str() );
+  Debug( 4, "Sending request: %s", request.c_str() );
   if ( write( sd, request.data(), request.length() ) < 0 ) {
     Error( "Can't write: %s", strerror(errno) );
     Disconnect();
     return( -1 );
   }
-  Debug( 3, "Request sent" );
+  Debug( 4, "Request sent" );
   return( 0 );
 }
 
-/* Return codes are as follows:
- * -1 means there was an error
- * 0 means no bytes were returned but there wasn't actually an error.
- * > 0 is the # of bytes read.
- */
-
-int RemoteCameraNVSocket::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
-  fd_set rfds;
-  FD_ZERO(&rfds);
-  FD_SET(sd, &rfds);
-
-  struct timeval temp_timeout = timeout;
-
-  int n_found = select(sd+1, &rfds, NULL, NULL, &temp_timeout);
-  if ( n_found == 0 ) {
-    Debug( 4, "Select timed out timeout was %d secs %d usecs", temp_timeout.tv_sec, temp_timeout.tv_usec );
-    int error = 0;
-    socklen_t len = sizeof(error);
-    int retval = getsockopt(sd, SOL_SOCKET, SO_ERROR, &error, &len);
-    if ( retval != 0 ) {
-      Debug(1, "error getting socket error code %s", strerror(retval));
-    }
-    if ( error != 0 ) {
-      return -1;
-    }
-    // Why are we disconnecting?  It's just a timeout, meaning that data wasn't available.
-    //Disconnect();
-    return 0;
-  } else if ( n_found < 0 ) {
-    Error("Select error: %s", strerror(errno));
-    return -1;
-  }
-
-  unsigned int total_bytes_to_read = 0;
-
-  if ( bytes_expected ) {
-    total_bytes_to_read = bytes_expected;
-  } else {
-    if ( ioctl( sd, FIONREAD, &total_bytes_to_read ) < 0 ) {
-      Error( "Can't ioctl(): %s", strerror(errno) );
-      return( -1 );
-    }
-
-    if ( total_bytes_to_read == 0 ) {
-      if ( mode == SINGLE_IMAGE ) {
-        int error = 0;
-        socklen_t len = sizeof (error);
-        int retval = getsockopt( sd, SOL_SOCKET, SO_ERROR, &error, &len );
-        if(retval != 0 ) {
-          Debug( 1, "error getting socket error code %s", strerror(retval) );
-        }
-        if (error != 0) {
-          return -1;
-        }
-        // Case where we are grabbing a single jpg, but no content-length was given, so the expectation is that we read until close.
-		    return( 0 );
-      }
-      // If socket is closed locally, then select will fail, but if it is closed remotely
-      // then we have an exception on our socket.. but no data.
-      Debug( 3, "Socket closed remotely" );
-      //Disconnect(); // Disconnect is done outside of ReadData now.
-      return( -1 );
-    }
-
-    // There can be lots of bytes available.  I've seen 4MB or more. This will vastly inflate our buffer size unnecessarily.
-    if ( total_bytes_to_read > ZM_NETWORK_BUFSIZ ) {
-      total_bytes_to_read = ZM_NETWORK_BUFSIZ;
-      Debug(3, "Just getting 32K" );
-    } else {
-      Debug(3, "Just getting %d", total_bytes_to_read );
-    }
-  } // end if bytes_expected or not
-  Debug( 3, "Expecting %d bytes", total_bytes_to_read );
-
-  int total_bytes_read = 0;
-  do {
-    int bytes_read = buffer.read_into( sd, total_bytes_to_read );
-    if ( bytes_read < 0 ) {
-      Error( "Read error: %s", strerror(errno) );
-      return( -1 );
-    } else if ( bytes_read == 0 ) {
-      Debug( 2, "Socket closed" );
-      //Disconnect(); // Disconnect is done outside of ReadData now.
-      return( -1 );
-    } else if ( (unsigned int)bytes_read < total_bytes_to_read ) {
-      Error( "Incomplete read, expected %d, got %d", total_bytes_to_read, bytes_read );
-      return( -1 );
-    }
-    Debug( 3, "Read %d bytes", bytes_read );
-    total_bytes_read += bytes_read;
-    total_bytes_to_read -= bytes_read;
-  } while ( total_bytes_to_read );
-
-  Debug( 4, buffer );
-
-  return( total_bytes_read );
-}
-
-int RemoteCameraNVSocket::PreCapture() {
+int RemoteCameraNVSocket::PrimeCapture() {
   if ( sd < 0 ) {
     Connect();
     if ( sd < 0 ) {
       Error( "Unable to connect to camera" );
       return( -1 );
     }
-    mode = SINGLE_IMAGE;
-    buffer.clear();
   }
-struct image_def {
-           uint16_t  width;
-           uint16_t height;
-           uint16_t   type;
-};
-struct image_def image_def;
+  buffer.clear();
+  struct image_def {
+    uint16_t  width;
+    uint16_t height;
+    uint16_t   type;
+  };
+  struct image_def image_def;
 
-  if ( SendRequest("GetImageParams") < 0 ) {
+  if ( SendRequest("GetImageParams\n") < 0 ) {
     Error( "Unable to send request" );
     Disconnect();
     return -1;
@@ -289,20 +187,28 @@ struct image_def image_def;
 }
 
 int RemoteCameraNVSocket::Capture( Image &image ) {
-  if ( SendRequest("GetNextImage") < 0 ) {
+  if ( SendRequest("GetNextImage\n") < 0 ) {
     Warning( "Unable to capture image, retrying" );
-    return( 1 );
+    return 0;
   }
   if ( Read( sd, buffer, imagesize ) < imagesize ) {
     Warning( "Unable to capture image, retrying" );
-    return( 1 );
+    return 0;
+  }
+  uint32_t end;
+  if ( Read(sd, (char *) &end , sizeof(end)) < 0 ) {
+    Warning( "Unable to capture image, retrying" );
+    return 0;
+  }
+  if ( end != 0xFFFFFFFF) {
+    Warning("End Bytes Failed\n");
+    return 0;
   }
 
   image.Assign( width, height, colours, subpixelorder, buffer, imagesize );
-  return( 0 );
+  return 1;
 }
 
-int RemoteCameraNVSocket::PostCapture()
-{
+int RemoteCameraNVSocket::PostCapture() {
   return( 0 );
 }
diff --git a/src/zm_remote_camera_nvsocket.h b/src/zm_remote_camera_nvsocket.h
index 4f62bafe3..67df93032 100644
--- a/src/zm_remote_camera_nvsocket.h
+++ b/src/zm_remote_camera_nvsocket.h
@@ -67,7 +67,7 @@ bool p_record_audio );
   int SendRequest( std::string );
   int ReadData( Buffer &buffer, unsigned int bytes_expected=0 );
   int GetResponse();
-  int PreCapture();
+  int PrimeCapture();
   int Capture( Image &image );
   int PostCapture();
   int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return(0);};
diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp
index 3973e5a71..b586c979f 100644
--- a/src/zm_rtp_ctrl.cpp
+++ b/src/zm_rtp_ctrl.cpp
@@ -332,7 +332,7 @@ int RtpCtrlThread::run()
       timeout = false;
       last_receive = time(NULL);
     }
-    for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ )
+    for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter )
     {
       if ( UdpInetSocket *socket = dynamic_cast<UdpInetSocket *>(*iter) )
       {
diff --git a/src/zm_rtp_data.cpp b/src/zm_rtp_data.cpp
index 496c0bcfd..4fbf0cd04 100644
--- a/src/zm_rtp_data.cpp
+++ b/src/zm_rtp_data.cpp
@@ -94,7 +94,7 @@ int RtpDataThread::run()
        mStop = true;
        break;
      }
-     for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ )
+     for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter )
      {
        if ( UdpInetServer *socket = dynamic_cast<UdpInetServer *>(*iter) )
        {
diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp
index f84b2aa53..897859435 100644
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@@ -36,8 +36,7 @@ int RtspThread::smMinDataPort = 0;
 int RtspThread::smMaxDataPort = 0;
 RtspThread::PortSet  RtspThread::smAssignedPorts;
 
-bool RtspThread::sendCommand( std::string message )
-{
+bool RtspThread::sendCommand( std::string message ) {
   if ( mNeedAuth ) {
     StringVector parts = split( message, " " );
     if (parts.size() > 1)
@@ -46,20 +45,15 @@ bool RtspThread::sendCommand( std::string message )
   message += stringtf( "User-Agent: ZoneMinder/%s\r\n", ZM_VERSION );
   message += stringtf( "CSeq: %d\r\n\r\n", ++mSeq );
   Debug( 2, "Sending RTSP message: %s", message.c_str() );
-  if ( mMethod == RTP_RTSP_HTTP )
-  {
+  if ( mMethod == RTP_RTSP_HTTP ) {
     message = base64Encode( message );
     Debug( 2, "Sending encoded RTSP message: %s", message.c_str() );
-    if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() )
-    {
+    if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() ) {
       Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
       return( false );
     }
-  }
-  else
-  {
-    if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
-    {
+  } else {
+    if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() ) {
       Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
       return( false );
     }
@@ -67,77 +61,60 @@ bool RtspThread::sendCommand( std::string message )
   return( true );
 }
 
-bool RtspThread::recvResponse( std::string &response )
-{
+bool RtspThread::recvResponse( std::string &response ) {
   if ( mRtspSocket.recv( response ) < 0 )
     Error( "Recv failed; %s", strerror(errno) );
   Debug( 2, "Received RTSP response: %s (%zd bytes)", response.c_str(), response.size() );
   float respVer = 0;
   respCode = -1;
   char respText[ZM_NETWORK_BUFSIZ];
-  if ( sscanf( response.c_str(), "RTSP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
-  {
-    if ( isalnum(response[0]) )
-    {
+  if ( sscanf( response.c_str(), "RTSP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 ) {
+    if ( isalnum(response[0]) ) {
       Error( "Response parse failure in '%s'", response.c_str() );
-    }
-    else
-    {
+    } else {
       Error( "Response parse failure, %zd bytes follow", response.size() );
       if ( response.size() )
         Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
     }
     return( false );
   }
-  if ( respCode == 401)
-  {
+  if ( respCode == 401) {
     Debug( 2, "Got 401 access denied response code, check WWW-Authenticate header and retry");
     mAuthenticator->checkAuthResponse(response);
     mNeedAuth = true;
     return( false );
-  } 
-  else if ( respCode != 200 )
-  {
+  } else if ( respCode != 200 ) {
     Error( "Unexpected response code %d, text is '%s'", respCode, respText );
     return( false );
   }
   return( true );
 }
 
-int RtspThread::requestPorts()
-{
-  if ( !smMinDataPort )
-  {
+int RtspThread::requestPorts() {
+  if ( !smMinDataPort ) {
     char sql[ZM_SQL_SML_BUFSIZ];
     strncpy( sql, "select Id from Monitors where Function != 'None' and Type = 'Remote' and Protocol = 'rtsp' and Method = 'rtpUni' order by Id asc", sizeof(sql) );
-    if ( mysql_query( &dbconn, sql ) )
-    {
+    if ( mysql_query( &dbconn, sql ) ) {
       Error( "Can't run query: %s", mysql_error( &dbconn ) );
       exit( mysql_errno( &dbconn ) );
     }
 
     MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
+    if ( !result ) {
       Error( "Can't use query result: %s", mysql_error( &dbconn ) );
       exit( mysql_errno( &dbconn ) );
     }
     int nMonitors = mysql_num_rows( result );
     int position = 0;
-    if ( nMonitors )
-    {
-      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-      {
+    if ( nMonitors ) {
+      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) {
         int id = atoi(dbrow[0]);
-        if ( mId == id )
-        {
+        if ( mId == id ) {
           position = i;
           break;
         }
       }
-    }
-    else
-    {
+    } else {
       // Minor hack for testing when not strictly enabled
       nMonitors = 1;
       position = 0;
@@ -148,11 +125,9 @@ int RtspThread::requestPorts()
     smMaxDataPort = smMinDataPort + portRange - 1;
     Debug( 2, "Assigned RTP port range is %d-%d", smMinDataPort, smMaxDataPort );
   }
-  for ( int i = smMinDataPort; i <= smMaxDataPort; i++ )
-  {
+  for ( int i = smMinDataPort; i <= smMaxDataPort; i++ ) {
     PortSet::const_iterator iter = smAssignedPorts.find( i );
-    if ( iter == smAssignedPorts.end() )
-    {
+    if ( iter == smAssignedPorts.end() ) {
       smAssignedPorts.insert( i );
       return( i );
     }
@@ -161,8 +136,7 @@ int RtspThread::requestPorts()
   return( -1 );
 }
 
-void RtspThread::releasePorts( int port )
-{
+void RtspThread::releasePorts( int port ) {
   if ( port > 0 )
     smAssignedPorts.erase( port );
 }
@@ -185,8 +159,7 @@ RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol,
   mStop( false )
 {
   mUrl = mProtocol+"://"+mHost+":"+mPort;
-  if ( !mPath.empty() )
-  {
+  if ( !mPath.empty() ) {
     if ( mPath[0] == '/' )
       mUrl += mPath;
     else
@@ -208,10 +181,8 @@ RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol,
     mAuthenticator = new zm::Authenticator(parts[0], "");
 }
 
-RtspThread::~RtspThread()
-{
-  if ( mFormatContext )
-  {
+RtspThread::~RtspThread() {
+  if ( mFormatContext ) {
 #if LIBAVFORMAT_VERSION_CHECK(52, 96, 0, 96, 0)
     avformat_free_context( mFormatContext );
 #else
@@ -219,16 +190,14 @@ RtspThread::~RtspThread()
 #endif
     mFormatContext = NULL;
   }
-  if ( mSessDesc )
-  {
+  if ( mSessDesc ) {
     delete mSessDesc;
     mSessDesc = NULL;
   }
   delete mAuthenticator;
 }
 
-int RtspThread::run()
-{
+int RtspThread::run() {
   std::string message;
   std::string response;
 
@@ -246,8 +215,7 @@ int RtspThread::run()
 
   
   bool authTried = false; 
-  if ( mMethod == RTP_RTSP_HTTP )
-  {
+  if ( mMethod == RTP_RTSP_HTTP ) {
     if ( !mRtspSocket2.connect( mHost.c_str(), mPort.c_str() ) )
       Fatal( "Unable to connect auxiliary RTSP/HTTP socket" );
     //Select select( 0.25 );
@@ -271,13 +239,11 @@ int RtspThread::run()
       message += "Accept: application/x-rtsp-tunnelled\r\n";
       message += "\r\n";
       Debug( 2, "Sending HTTP message: %s", message.c_str() );
-      if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
-      {
+      if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() ) {
         Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
         return( -1 );
       }
-      if ( mRtspSocket.recv( response ) < 0 )
-      {
+      if ( mRtspSocket.recv( response ) < 0 ) {
         Error( "Recv failed; %s", strerror(errno) );
         return( -1 );
       }
@@ -285,14 +251,10 @@ int RtspThread::run()
       Debug( 2, "Received HTTP response: %s (%zd bytes)", response.c_str(), response.size() );
       float respVer = 0;
       respCode = -1;
-      if ( sscanf( response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
-      {
-        if ( isalnum(response[0]) )
-        {
+      if ( sscanf( response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 ) {
+        if ( isalnum(response[0]) ) {
           Error( "Response parse failure in '%s'", response.c_str() );
-        }
-        else
-        {
+        } else {
           Error( "Response parse failure, %zd bytes follow", response.size() );
           if ( response.size() )
             Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
@@ -313,8 +275,7 @@ int RtspThread::run()
       
     } while (respCode == 401 && !authTried);  
     
-    if ( respCode != 200 )
-    {
+    if ( respCode != 200 ) {
       Error( "Unexpected response code %d, text is '%s'", respCode, respText );
       return( -1 );
     }
@@ -327,8 +288,7 @@ int RtspThread::run()
     message += "Content-Type: application/x-rtsp-tunnelled\r\n";
     message += "\r\n";
     Debug( 2, "Sending HTTP message: %s", message.c_str() );
-    if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() )
-    {
+    if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() ) {
       Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
       return( -1 );
     }
@@ -383,17 +343,14 @@ int RtspThread::run()
   if( sdpStart == std::string::npos )
     return( -1 );
 
-  if ( mRtspDescribe )
-  {
+  if ( mRtspDescribe ) {
     std::string DescHeader = response.substr( 0,sdpStart );
     Debug( 1, "Processing DESCRIBE response header '%s'", DescHeader.c_str() );
 
     lines = split( DescHeader, "\r\n" );
-    for ( size_t i = 0; i < lines.size(); i++ )
-      {
+    for ( size_t i = 0; i < lines.size(); i++ ) {
         // If the device sends us a url value for Content-Base in the response header, we should use that instead
-        if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) )
-          {
+        if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) ) {
             mUrl = trimSpaces( lines[i].substr( 13 ) );
             Info("Received new Content-Base in DESCRIBE response header. Updated device Url to: '%s'", mUrl.c_str() );
             break;
@@ -406,13 +363,10 @@ int RtspThread::run()
   std::string sdp = response.substr( sdpStart );
   Debug( 1, "Processing SDP '%s'", sdp.c_str() );
 
-  try
-  {
+  try {
     mSessDesc = new SessionDescriptor( mUrl, sdp );
     mFormatContext = mSessDesc->generateFormatContext();
-  }
-  catch( const Exception &e )
-  {
+  } catch( const Exception &e ) {
     Error( e.getMessage().c_str() );
     return( -1 );
   }
@@ -436,10 +390,8 @@ int RtspThread::run()
   
   _AVCODECID codecId;
   
-  if ( mFormatContext->nb_streams >= 1 )
-  {
-    for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ )
-    {
+  if ( mFormatContext->nb_streams >= 1 ) {
+    for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {
       SessionDescriptor::MediaDescriptor *mediaDesc = mSessDesc->getStream( i );
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
       if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
@@ -449,12 +401,9 @@ int RtspThread::run()
       {
         // Check if control Url is absolute or relative
         controlUrl = mediaDesc->getControlUrl();
-        if (std::equal(trackUrl.begin(), trackUrl.end(), controlUrl.begin()))
-        {
+        if (std::equal(trackUrl.begin(), trackUrl.end(), controlUrl.begin())) {
           trackUrl = controlUrl;
-        }
-        else
-        {
+        } else {
           if ( *trackUrl.rbegin() != '/') {
             trackUrl += "/" + controlUrl;
           } else {
@@ -470,8 +419,7 @@ int RtspThread::run()
     }
   }
 
-  switch( mMethod )
-  {
+  switch( mMethod ) {
     case RTP_UNICAST :
     {
       localPorts[0] = requestPorts();
@@ -508,10 +456,8 @@ int RtspThread::run()
   int timeout = 0;
   char transport[256] = "";
 
-  for ( size_t i = 0; i < lines.size(); i++ )
-  {
-    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) )
-    {
+  for ( size_t i = 0; i < lines.size(); i++ ) {
+    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) ) {
       StringVector sessionLine = split( lines[i].substr(9), ";" );
       session = trimSpaces( sessionLine[0] );
       if ( sessionLine.size() == 2 )
@@ -536,41 +482,31 @@ int RtspThread::run()
   std::string distribution = "";
   unsigned long ssrc = 0;
   StringVector parts = split( transport, ";" );
-  for ( size_t i = 0; i < parts.size(); i++ )
-  {
+  for ( size_t i = 0; i < parts.size(); i++ ) {
     if ( parts[i] == "unicast" || parts[i] == "multicast" )
       distribution = parts[i];
-    else if ( startsWith( parts[i], "server_port=" ) )
-    {
+    else if ( startsWith( parts[i], "server_port=" ) ) {
       method = "RTP/UNICAST";
       StringVector subparts = split( parts[i], "=" );
       StringVector ports = split( subparts[1], "-" );
       remotePorts[0] = strtol( ports[0].c_str(), NULL, 10 );
       remotePorts[1] = strtol( ports[1].c_str(), NULL, 10 );
-    }
-    else if ( startsWith( parts[i], "interleaved=" ) )
-    {
+    } else if ( startsWith( parts[i], "interleaved=" ) ) {
       method = "RTP/RTSP";
       StringVector subparts = split( parts[i], "=" );
       StringVector channels = split( subparts[1], "-" );
       remoteChannels[0] = strtol( channels[0].c_str(), NULL, 10 );
       remoteChannels[1] = strtol( channels[1].c_str(), NULL, 10 );
-    }
-    else if ( startsWith( parts[i], "port=" ) )
-    {
+    } else if ( startsWith( parts[i], "port=" ) ) {
       method = "RTP/MULTICAST";
       StringVector subparts = split( parts[i], "=" );
       StringVector ports = split( subparts[1], "-" );
       localPorts[0] = strtol( ports[0].c_str(), NULL, 10 );
       localPorts[1] = strtol( ports[1].c_str(), NULL, 10 );
-    }
-    else if ( startsWith( parts[i], "destination=" ) )
-    {
+    } else if ( startsWith( parts[i], "destination=" ) ) {
       StringVector subparts = split( parts[i], "=" );
       localHost = subparts[1];
-    }
-    else if ( startsWith( parts[i], "ssrc=" ) )
-    {
+    } else if ( startsWith( parts[i], "ssrc=" ) ) {
       StringVector subparts = split( parts[i], "=" );
       ssrc = strtoll( subparts[1].c_str(), NULL, 16 );
     }
@@ -592,13 +528,11 @@ int RtspThread::run()
 
   lines = split( response, "\r\n" );
   std::string rtpInfo;
-  for ( size_t i = 0; i < lines.size(); i++ )
-  {
+  for ( size_t i = 0; i < lines.size(); i++ ) {
     if ( ( lines[i].size() > 9 ) && ( lines[i].substr( 0, 9 ) == "RTP-Info:" ) )
       rtpInfo = trimSpaces( lines[i].substr( 9 ) );
   // Check for a timeout again. Some rtsp devices don't send a timeout until after the PLAY command is sent
-    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) && ( timeout == 0 ) )
-    {
+    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) && ( timeout == 0 ) ) {
       StringVector sessionLine = split( lines[i].substr(9), ";" );
       if ( sessionLine.size() == 2 )
         sscanf( trimSpaces( sessionLine[1] ).c_str(), "timeout=%d", &timeout );
@@ -610,31 +544,22 @@ int RtspThread::run()
   int seq = 0;
   unsigned long rtpTime = 0;
   StringVector streams;
-  if ( rtpInfo.empty() )
-  {
+  if ( rtpInfo.empty() ) {
     Debug( 1, "RTP Info Empty. Starting values for Sequence and Rtptime shall be zero.");
-  }
-  else
-  {
+  } else {
     Debug( 2, "Got RTP Info %s", rtpInfo.c_str() );
     // More than one stream can be included in the RTP Info
     streams = split( rtpInfo.c_str(), "," );
-    for ( size_t i = 0; i < streams.size(); i++ )
-    {
+    for ( size_t i = 0; i < streams.size(); i++ ) {
       // We want the stream that matches the trackUrl we are using
-      if ( streams[i].find(controlUrl.c_str()) != std::string::npos )
-      {
+      if ( streams[i].find(controlUrl.c_str()) != std::string::npos ) {
         // Parse the sequence and rtptime values
         parts = split( streams[i].c_str(), ";" );
-        for ( size_t j = 0; j < parts.size(); j++ )
-        {
-          if ( startsWith( parts[j], "seq=" ) )
-          {
+        for ( size_t j = 0; j < parts.size(); j++ ) {
+          if ( startsWith( parts[j], "seq=" ) ) {
             StringVector subparts = split( parts[j], "=" );
             seq = strtol( subparts[1].c_str(), NULL, 10 );
-          }
-          else if ( startsWith( parts[j], "rtptime=" ) )
-          {
+          } else if ( startsWith( parts[j], "rtptime=" ) ) {
             StringVector subparts = split( parts[j], "=" );
             rtpTime = strtol( subparts[1].c_str(), NULL, 10 );
           }
@@ -651,8 +576,7 @@ int RtspThread::run()
   time_t now;
   message = "GET_PARAMETER "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
 
-  switch( mMethod )
-  {
+  switch( mMethod ) {
     case RTP_UNICAST :
     {
       RtpSource *source = new RtpSource( mId, "", localPorts[0], mHost, remotePorts[0], ssrc, seq, rtpClock, rtpTime, codecId );
@@ -663,13 +587,11 @@ int RtspThread::run()
       rtpDataThread.start();
       rtpCtrlThread.start();
 
-      while( !mStop )
-      {
+      while( !mStop ) {
         now = time(NULL);
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
 Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
-        if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) )
-        {
+        if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) ) {
           if ( !sendCommand( message ) )
             return( -1 );
           lastKeepalive = now;
@@ -721,11 +643,9 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
       Buffer buffer( ZM_NETWORK_BUFSIZ );
       std::string keepaliveMessage = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
       std::string keepaliveResponse = "RTSP/1.0 200 OK\r\n";
-      while ( !mStop && select.wait() >= 0 )
-      {
+      while ( !mStop && select.wait() >= 0 ) {
         Select::CommsList readable = select.getReadable();
-        if ( readable.size() == 0 )
-        {
+        if ( readable.size() == 0 ) {
           Error( "RTSP timed out" );
           break;
         }
@@ -735,23 +655,19 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
         buffer.append( tempBuffer, nBytes );
         Debug( 4, "Read %zd bytes on sd %d, %d total", nBytes, mRtspSocket.getReadDesc(), buffer.size() );
 
-        while( buffer.size() > 0 )
-        {
-          if ( buffer[0] == '$' )
-          {
+        while( buffer.size() > 0 ) {
+          if ( buffer[0] == '$' ) {
             if ( buffer.size() < 4 )
               break;
             unsigned char channel = buffer[1];
             unsigned short len = ntohs( *((unsigned short *)(buffer+2)) );
 
             Debug( 4, "Got %d bytes left, expecting %d byte packet on channel %d", buffer.size(), len, channel );
-            if ( (unsigned short)buffer.size() < (len+4) )
-            {
+            if ( (unsigned short)buffer.size() < (len+4) ) {
               Debug( 4, "Missing %d bytes, rereading", (len+4)-buffer.size() );
               break;
             }
-            if ( channel == remoteChannels[0] )
-            {
+            if ( channel == remoteChannels[0] ) {
               Debug( 4, "Got %d bytes on data channel %d, packet length is %d", buffer.size(), channel, len );
               Hexdump( 4, (char *)buffer, 16 );
               rtpDataThread.recvPacket( buffer+4, len );
diff --git a/src/zm_rtsp.h b/src/zm_rtsp.h
index 51a2c99aa..14ef02010 100644
--- a/src/zm_rtsp.h
+++ b/src/zm_rtsp.h
@@ -31,8 +31,7 @@
 #include <set>
 #include <map>
 
-class RtspThread : public Thread
-{
+class RtspThread : public Thread {
 public:
   typedef enum { RTP_UNICAST, RTP_MULTICAST, RTP_RTSP, RTP_RTSP_HTTP } RtspMethod;
   typedef enum { UNDEFINED, UNICAST, MULTICAST } RtspDist;
diff --git a/src/zm_rtsp_auth.cpp b/src/zm_rtsp_auth.cpp
index 6598bd254..9b91ff65c 100644
--- a/src/zm_rtsp_auth.cpp
+++ b/src/zm_rtsp_auth.cpp
@@ -26,7 +26,11 @@
 
 namespace zm {
 
-Authenticator::Authenticator(std::string &username, std::string password) {
+Authenticator::Authenticator( const std::string &username, const std::string &password) : 
+ fCnonce( "0a4f113b" ),
+ fUsername(username),
+ fPassword(password)
+  {
 #ifdef HAVE_GCRYPT_H
   // Special initialisation for libgcrypt
   if ( !gcry_check_version( GCRYPT_VERSION ) )
@@ -38,10 +42,7 @@ Authenticator::Authenticator(std::string &username, std::string password) {
 #endif // HAVE_GCRYPT_H
   
   fAuthMethod = AUTH_UNDEFINED;
-  fUsername = username;
-  fPassword = password;
   nc = 1;
-  fCnonce = "0a4f113b";
 }
 
 Authenticator::~Authenticator() {
@@ -96,13 +97,11 @@ void Authenticator::authHandleHeader(std::string headerData)
   }
 }
 
-std::string Authenticator::quote(std::string src)
-{
+std::string Authenticator::quote( const std::string &src ) {
   return replaceAll(replaceAll(src, "\\", "\\\\"), "\"", "\\\"");
 }
 
-std::string Authenticator::getAuthHeader(std::string method, std::string uri) 
-{
+std::string Authenticator::getAuthHeader(std::string method, std::string uri) {
   std::string result = "Authorization: ";
   if (fAuthMethod == AUTH_BASIC) 
   {
diff --git a/src/zm_rtsp_auth.h b/src/zm_rtsp_auth.h
index 152dab85a..34056eee6 100644
--- a/src/zm_rtsp_auth.h
+++ b/src/zm_rtsp_auth.h
@@ -37,7 +37,7 @@ namespace zm {
 enum AuthMethod { AUTH_UNDEFINED = 0, AUTH_BASIC = 1, AUTH_DIGEST = 2 };
 class Authenticator {
 public:
-  Authenticator(std::string &username, std::string password);
+  Authenticator(const std::string &username, const std::string &password);
   virtual ~Authenticator();
   void reset();
 
@@ -60,7 +60,7 @@ private:
   std::string fQop;
   std::string fUsername; 
   std::string fPassword;
-  std::string quote( std::string src );
+  std::string quote( const std::string &src );
   int nc;
 };
 
diff --git a/src/zm_sdp.cpp b/src/zm_sdp.cpp
index ffcea791b..1361c5143 100644
--- a/src/zm_sdp.cpp
+++ b/src/zm_sdp.cpp
@@ -159,8 +159,7 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
   MediaDescriptor *currMedia = 0;
 
   StringVector lines = split( sdp, "\r\n" );
-  for ( StringVector::const_iterator iter = lines.begin(); iter != lines.end(); iter++ )
-  {
+  for ( StringVector::const_iterator iter = lines.begin(); iter != lines.end(); ++iter ) {
     std::string line = *iter;
     if ( line.empty() )
       break;
@@ -276,48 +275,26 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
               {
                 StringVector attr3Tokens = split( attr2Tokens[i], "=" );
                 //Info( "Name = %s, Value = %s", attr3Tokens[0].c_str(), attr3Tokens[1].c_str() );
-                if ( attr3Tokens[0] == "profile-level-id" )
-                {
-                }
-                else if ( attr3Tokens[0] == "config" )
-                {
-                }
-                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
-                {
+                if ( attr3Tokens[0] == "profile-level-id" ) {
+                } else if ( attr3Tokens[0] == "config" ) {
+                } else if ( attr3Tokens[0] == "sprop-parameter-sets" ) {
                     size_t t = attr2Tokens[i].find("=");
                     char *c = (char *)attr2Tokens[i].c_str() + t + 1;
                     Debug(4, "sprop-parameter-sets value %s", c);
                   currMedia->setSprops(std::string(c));
-                }
-                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
-                {
-                    size_t t = attr2Tokens[i].find("=");
-                    char *c = (char *)attr2Tokens[i].c_str() + t + 1;
-                    Debug(4, "sprop-parameter-sets value %s", c);
-                  currMedia->setSprops(std::string(c));
-                }
-                else 
-                {
+                } else {
                   Debug( 3, "Ignoring SDP fmtp attribute '%s' for media '%s'", attr3Tokens[0].c_str(), currMedia->getType().c_str() )
                 }
               }
             }
-          }
-          else if ( attrName == "mpeg4-iod" )
-          {
+          } else if ( attrName == "mpeg4-iod" ) {
             // a=mpeg4-iod: "data:application/mpeg4-iod;base64,AoEAAE8BAf73AQOAkwABQHRkYXRhOmFwcGxpY2F0aW9uL21wZWc0LW9kLWF1O2Jhc2U2NCxBVGdCR3dVZkF4Y0F5U1FBWlFRTklCRUVrK0FBQWEyd0FBR3RzQVlCQkFFWkFwOERGUUJsQlFRTlFCVUFDN2dBQVBvQUFBRDZBQVlCQXc9PQQNAQUABAAAAAAAAAAAAAYJAQAAAAAAAAAAA0IAAkA+ZGF0YTphcHBsaWNhdGlvbi9tcGVnNC1iaWZzLWF1O2Jhc2U2NCx3QkFTZ1RBcUJYSmhCSWhRUlFVL0FBPT0EEgINAAACAAAAAAAAAAAFAwAAQAYJAQAAAAAAAAAA"
-          }
-          else if ( attrName == "mpeg4-esid" )
-          {
+          } else if ( attrName == "mpeg4-esid" ) {
             // a=mpeg4-esid:201
-          }
-          else
-          {
+          } else {
             Debug( 3, "Ignoring SDP attribute '%s' for media '%s'", line.c_str(), currMedia->getType().c_str() )
           }
-        }
-        else
-        {
+        } else {
           Debug( 3, "Ignoring general SDP attribute '%s'", line.c_str() );
         }
         break;
@@ -369,8 +346,7 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
     strncpy( formatContext->comment, mInfo.c_str(), sizeof(formatContext->comment) );
 */
   //formatContext->nb_streams = mMediaList.size();
-  for ( unsigned int i = 0; i < mMediaList.size(); i++ )
-  {
+  for ( unsigned int i = 0; i < mMediaList.size(); i++ ) {
     const MediaDescriptor *mediaDesc = mMediaList[i];
 #if !LIBAVFORMAT_VERSION_CHECK(53, 10, 0, 17, 0)
     AVStream *stream = av_new_stream( formatContext, i );
@@ -379,62 +355,62 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
     stream->id = i;
 #endif
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    AVCodecContext *codec_context = avcodec_alloc_context3(NULL);
+    avcodec_parameters_to_context(codec_context, stream->codecpar);
+#else
+    AVCodecContext *codec_context = stream->codec;
+#endif
+
     Debug( 1, "Looking for codec for %s payload type %d / %s",  mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
     if ( mediaDesc->getType() == "video" )
-      stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+      codec_context->codec_type = AVMEDIA_TYPE_VIDEO;
     else if ( mediaDesc->getType() == "audio" )
-      stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+      codec_context->codec_type = AVMEDIA_TYPE_AUDIO;
     else if ( mediaDesc->getType() == "application" )
-      stream->codec->codec_type = AVMEDIA_TYPE_DATA;
+      codec_context->codec_type = AVMEDIA_TYPE_DATA;
 #else
     if ( mediaDesc->getType() == "video" )
-      stream->codec->codec_type = CODEC_TYPE_VIDEO;
+      codec_context->codec_type = CODEC_TYPE_VIDEO;
     else if ( mediaDesc->getType() == "audio" )
-      stream->codec->codec_type = CODEC_TYPE_AUDIO;
+      codec_context->codec_type = CODEC_TYPE_AUDIO;
     else if ( mediaDesc->getType() == "application" )
-      stream->codec->codec_type = CODEC_TYPE_DATA;
+      codec_context->codec_type = CODEC_TYPE_DATA;
 #endif
 
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
     std::string codec_name;
 #endif
-    if ( mediaDesc->getPayloadType() < PAYLOAD_TYPE_DYNAMIC )
-    {
+    if ( mediaDesc->getPayloadType() < PAYLOAD_TYPE_DYNAMIC ) {
       // Look in static table
-      for ( unsigned int i = 0; i < (sizeof(smStaticPayloads)/sizeof(*smStaticPayloads)); i++ )
-      {
-        if ( smStaticPayloads[i].payloadType == mediaDesc->getPayloadType() )
-        {
+      for ( unsigned int i = 0; i < (sizeof(smStaticPayloads)/sizeof(*smStaticPayloads)); i++ ) {
+        if ( smStaticPayloads[i].payloadType == mediaDesc->getPayloadType() ) {
           Debug( 1, "Got static payload type %d, %s", smStaticPayloads[i].payloadType, smStaticPayloads[i].payloadName );
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
           codec_name = std::string( smStaticPayloads[i].payloadName );
 #else
-          strncpy( stream->codec->codec_name, smStaticPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
+          strncpy( codec_context->codec_name, smStaticPayloads[i].payloadName, sizeof(codec_context->codec_name) );;
 #endif
-          stream->codec->codec_type = smStaticPayloads[i].codecType;
-          stream->codec->codec_id = smStaticPayloads[i].codecId;
-          stream->codec->sample_rate = smStaticPayloads[i].clockRate;
+          codec_context->codec_type = smStaticPayloads[i].codecType;
+          codec_context->codec_id = smStaticPayloads[i].codecId;
+          codec_context->sample_rate = smStaticPayloads[i].clockRate;
           break;
         }
       }
-    }
-    else
-    {
+    } else {
       // Look in dynamic table
-      for ( unsigned int i = 0; i < (sizeof(smDynamicPayloads)/sizeof(*smDynamicPayloads)); i++ )
-      {
-        if ( smDynamicPayloads[i].payloadName == mediaDesc->getPayloadDesc() )
-        {
+      for ( unsigned int i = 0; i < (sizeof(smDynamicPayloads)/sizeof(*smDynamicPayloads)); i++ ) {
+        if ( smDynamicPayloads[i].payloadName == mediaDesc->getPayloadDesc() ) {
           Debug( 1, "Got dynamic payload type %d, %s", mediaDesc->getPayloadType(), smDynamicPayloads[i].payloadName );
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
           codec_name = std::string( smStaticPayloads[i].payloadName );
 #else
-          strncpy( stream->codec->codec_name, smDynamicPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
+          strncpy( codec_context->codec_name, smDynamicPayloads[i].payloadName, sizeof(codec_context->codec_name) );;
 #endif
-          stream->codec->codec_type = smDynamicPayloads[i].codecType;
-          stream->codec->codec_id = smDynamicPayloads[i].codecId;
-          stream->codec->sample_rate = mediaDesc->getClock();
+          codec_context->codec_type = smDynamicPayloads[i].codecType;
+          codec_context->codec_id = smDynamicPayloads[i].codecId;
+          codec_context->sample_rate = mediaDesc->getClock();
           break;
         }
       }
@@ -450,14 +426,13 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
       //return( 0 );
     }
     if ( mediaDesc->getWidth() )
-      stream->codec->width = mediaDesc->getWidth();
+      codec_context->width = mediaDesc->getWidth();
     if ( mediaDesc->getHeight() )
-      stream->codec->height = mediaDesc->getHeight();
-    if ( stream->codec->codec_id == AV_CODEC_ID_H264 && mediaDesc->getSprops().size())
-    {
+      codec_context->height = mediaDesc->getHeight();
+    if ( codec_context->codec_id == AV_CODEC_ID_H264 && mediaDesc->getSprops().size()) {
       uint8_t start_sequence[]= { 0, 0, 1 };
-      stream->codec->extradata_size= 0;
-      stream->codec->extradata= NULL;
+      codec_context->extradata_size= 0;
+      codec_context->extradata= NULL;
       char pvalue[1024], *value = pvalue;
     
       strcpy(pvalue, mediaDesc->getSprops().c_str());
@@ -482,22 +457,33 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
         if (packet_size) {
           uint8_t *dest = 
           (uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
-                       stream->codec->extradata_size +
-                       FF_INPUT_BUFFER_PADDING_SIZE);
+                       codec_context->extradata_size +
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
+                       AV_INPUT_BUFFER_PADDING_SIZE
+#else
+                       FF_INPUT_BUFFER_PADDING_SIZE
+#endif
+);
           if(dest) {
-              if(stream->codec->extradata_size) {
+              if(codec_context->extradata_size) {
                 // av_realloc?
-              memcpy(dest, stream->codec->extradata, stream->codec->extradata_size);
-                av_free(stream->codec->extradata);
+              memcpy(dest, codec_context->extradata, codec_context->extradata_size);
+                av_free(codec_context->extradata);
               }
 
-              memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
-              memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
-              memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
-                     packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+              memcpy(dest+codec_context->extradata_size, start_sequence, sizeof(start_sequence));
+              memcpy(dest+codec_context->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
+              memset(dest+codec_context->extradata_size+sizeof(start_sequence)+
+                     packet_size, 0,
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
+                       AV_INPUT_BUFFER_PADDING_SIZE
+#else
+                       FF_INPUT_BUFFER_PADDING_SIZE
+#endif
+);
 
-              stream->codec->extradata= dest;
-              stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;
+              codec_context->extradata= dest;
+              codec_context->extradata_size+= sizeof(start_sequence)+packet_size;
 //          } else {
 //            av_log(codec, AV_LOG_ERROR, "Unable to allocate memory for extradata!");
 //            return AVERROR(ENOMEM);
diff --git a/src/zm_sdp.h b/src/zm_sdp.h
index 48a05b706..ae7cd67a2 100644
--- a/src/zm_sdp.h
+++ b/src/zm_sdp.h
@@ -31,13 +31,11 @@
 #include <string>
 #include <vector>
 
-class SessionDescriptor
-{
+class SessionDescriptor {
 protected:
   enum { PAYLOAD_TYPE_DYNAMIC=96 };
 
-  struct StaticPayloadDesc
-  {
+  struct StaticPayloadDesc {
     int payloadType;
     const char payloadName[6];
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
@@ -50,8 +48,7 @@ protected:
     int autoChannels;
   };
 
-  struct DynamicPayloadDesc
-  {
+  struct DynamicPayloadDesc {
     const char payloadName[32];
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
     AVMediaType codecType;
@@ -65,8 +62,7 @@ protected:
   };
 
 public:
-  class ConnInfo
-  {
+  class ConnInfo {
   protected:
     std::string mNetworkType;
     std::string mAddressType;
@@ -75,21 +71,19 @@ public:
     int mNoAddresses;
 
   public:
-    ConnInfo( const std::string &connInfo );
+    explicit ConnInfo( const std::string &connInfo );
   };
 
-  class BandInfo
-  {
+  class BandInfo {
   protected:
     std::string mType;
     int mValue;
 
   public:
-    BandInfo( const std::string &bandInfo );
+    explicit BandInfo( const std::string &bandInfo );
   };
 
-  class MediaDescriptor
-  {
+  class MediaDescriptor {
   protected:
     std::string mType;
     int mPort;
@@ -144,48 +138,38 @@ public:
     {
       return( mControlUrl );
     }
-    void setControlUrl( const std::string &controlUrl )
-    {
+    void setControlUrl( const std::string &controlUrl ) {
       mControlUrl = controlUrl;
     }
 
-    const int getClock() const
-    {
+    const int getClock() const {
       return( mClock );
     }
-    void setClock( int clock )
-    {
+    void setClock( int clock ) {
       mClock = clock;
     }
 
-    void setFrameSize( int width, int height )
-    {
+    void setFrameSize( int width, int height ) {
       mWidth = width;
       mHeight = height;
     }
-    int getWidth() const
-    {
+    int getWidth() const {
       return( mWidth );
     }
-    int getHeight() const
-    {
+    int getHeight() const {
       return( mHeight );
     }
 
-    void setSprops(const std::string props)
-    {
+    void setSprops(const std::string &props) {
       mSprops = props;
     }
-    const std::string getSprops() const
-    {
+    const std::string getSprops() const {
       return ( mSprops );
     }
-    const double getFrameRate() const
-    {
+    const double getFrameRate() const {
       return( mFrameRate );
     }
-    void setFrameRate( double frameRate )
-    {
+    void setFrameRate( double frameRate ) {
       mFrameRate = frameRate;
     }
   };
diff --git a/src/zm_storage.h b/src/zm_storage.h
index e47986801..75817a903 100644
--- a/src/zm_storage.h
+++ b/src/zm_storage.h
@@ -32,8 +32,8 @@ protected:
 
 public:
 	Storage();
-	Storage( MYSQL_ROW &dbrow );
-	Storage( unsigned int p_id );
+	explicit Storage( MYSQL_ROW &dbrow );
+	explicit Storage( unsigned int p_id );
 	~Storage();
 
 	unsigned int	Id() const { return( id ); }
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 282db0f40..8c488194b 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -75,6 +75,7 @@ void StreamBase::updateFrameRate( double fps ) {
 
 bool StreamBase::checkCommandQueue() {
   if ( sd >= 0 ) {
+    Debug(2, "sd is (%d)", sd );
     CmdMsg msg;
     memset( &msg, 0, sizeof(msg) );
     int nbytes = recvfrom( sd, &msg, sizeof(msg), MSG_DONTWAIT, 0, 0 );
@@ -88,9 +89,12 @@ bool StreamBase::checkCommandQueue() {
       //Error( "Partial message received, expected %d bytes, got %d", sizeof(msg), nbytes );
     //}
     else {
+Debug(2, "Message length is (%d)", nbytes );
       processCommand( &msg );
       return( true );
     }
+  } else {
+    Error("sd is < 0");
   }
   return( false );
 }
@@ -287,7 +291,7 @@ void StreamBase::openComms() {
     if ( sd < 0 ) {
       Fatal( "Can't create socket: %s", strerror(errno) );
 		} else {
-			Debug(3, "Have socket %d", sd );
+			Debug(1, "Have socket %d", sd );
     }
 
     length = snprintf( loc_sock_path, sizeof(loc_sock_path), "%s/zms-%06ds.sock", staticConfig.PATH_SOCKS.c_str(), connkey );
@@ -295,6 +299,7 @@ void StreamBase::openComms() {
       Warning("Socket path was truncated.");
       length = sizeof(loc_sock_path)-1;
     }
+    // Unlink before bind, in case it already exists
     unlink( loc_sock_path );
     if ( sizeof(loc_addr.sun_path) < length ) {
       Error("Not enough space %d in loc_addr.sun_path for socket file %s", sizeof(loc_addr.sun_path), loc_sock_path );
@@ -312,7 +317,7 @@ void StreamBase::openComms() {
     rem_addr.sun_family = AF_UNIX;
   } // end if connKey > 0
 	Debug(2, "comms open" );
-}
+} // end void StreamBase::openComms()
 
 void StreamBase::closeComms() {
   if ( connkey > 0 ) {
@@ -323,10 +328,10 @@ void StreamBase::closeComms() {
     if ( loc_sock_path[0] ) {
       unlink( loc_sock_path );
     }
-    if (lock_fd > 0) {
+    if ( lock_fd > 0 ) {
       close(lock_fd); //close it rather than unlock it incase it got deleted.
-      unlink(sock_path_lock);
+      // You cannot unlink the lockfile.  You have to leave a mess around.  SUCKS
+      //unlink(sock_path_lock);
     }
   }
 }
-
diff --git a/src/zm_stream.h b/src/zm_stream.h
index dbe4c1db6..5623f8a0d 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -141,6 +141,8 @@ public:
 #if HAVE_LIBAVCODEC   
     vid_stream = 0;
 #endif // HAVE_LIBAVCODEC   
+    last_frame_sent = 0.0;
+    msg = { 0, { 0 } };
   }
   virtual ~StreamBase();
 
diff --git a/src/zm_thread.h b/src/zm_thread.h
index 8c84d9041..771d6e80b 100644
--- a/src/zm_thread.h
+++ b/src/zm_thread.h
@@ -32,8 +32,7 @@
 #include <sys/thr.h>
 #endif
 
-class ThreadException : public Exception
-{
+class ThreadException : public Exception {
 private:
 #ifndef SOLARIS
   pid_t pid() {
@@ -55,12 +54,11 @@ private:
   pthread_t pid() { return( pthread_self() ); }
 #endif
 public:
-  ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) ) {
+  explicit ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) ) {
   }
 };
 
-class Mutex
-{
+class Mutex {
 friend class Condition;
 
 private:
@@ -71,8 +69,7 @@ public:
   ~Mutex();
 
 private:
-  pthread_mutex_t *getMutex()
-  {
+  pthread_mutex_t *getMutex() {
     return( &mMutex );
   }
 
@@ -84,18 +81,15 @@ public:
   bool locked();
 };
 
-class ScopedMutex
-{
+class ScopedMutex {
 private:
   Mutex &mMutex;
 
 public:
-  ScopedMutex( Mutex &mutex ) : mMutex( mutex )
-  {
+  explicit ScopedMutex( Mutex &mutex ) : mMutex( mutex ) {
     mMutex.lock();
   }
-  ~ScopedMutex()
-  {
+  ~ScopedMutex() {
     mMutex.unlock();
   }
 
@@ -164,8 +158,7 @@ public:
   }
 };
 
-template <class T> class ThreadData
-{
+template <class T> class ThreadData {
 private:
   T mValue;
   mutable bool mChanged;
@@ -173,11 +166,11 @@ private:
   mutable Condition mCondition;
 
 public:
-  __attribute__((used)) ThreadData() : mCondition( mMutex )
-  {
+  __attribute__((used)) ThreadData() : mCondition( mMutex ) {
+    mChanged = false;
   }
-  __attribute__((used)) ThreadData( T value ) : mValue( value ), mCondition( mMutex )
-  {
+  __attribute__((used)) ThreadData( T value ) : mValue( value ), mCondition( mMutex ) {
+    mChanged = false;
   }
   //~ThreadData() {}
 
diff --git a/src/zm_user.cpp b/src/zm_user.cpp
index 58de254bd..b6c9f9553 100644
--- a/src/zm_user.cpp
+++ b/src/zm_user.cpp
@@ -27,11 +27,12 @@
 #include <string.h>
 #include <time.h>
 
+#include "zm_utils.h"
+
 User::User() {
   username[0] = password[0] = 0;
   enabled = false;
   stream = events = control = monitors = system = PERM_NONE;
-  monitor_ids = 0;
 }
 
 User::User( MYSQL_ROW &dbrow ) {
@@ -44,45 +45,41 @@ User::User( MYSQL_ROW &dbrow ) {
   control = (Permission)atoi( dbrow[index++] );
   monitors = (Permission)atoi( dbrow[index++] );
   system = (Permission)atoi( dbrow[index++] );
-  monitor_ids = 0;
   char *monitor_ids_str = dbrow[index++];
   if ( monitor_ids_str && *monitor_ids_str ) {
-    monitor_ids = new int[strlen(monitor_ids_str)];
-    int n_monitor_ids = 0;
-    const char *ptr = monitor_ids_str;
-    do {
-      int id = 0;
-      while( isdigit( *ptr ) ) {
-        id *= 10;
-        id += *ptr-'0';
-        ptr++;
-      }
-      if ( id ) {
-        monitor_ids[n_monitor_ids++] = id;
-        if ( !*ptr )
-          break;
-      }
-      while ( !isdigit( *ptr ) )
-        ptr++;
-    } while( *ptr );
-    monitor_ids[n_monitor_ids] = 0;
+    StringVector ids = split(monitor_ids_str, ",");
+    for( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
+      monitor_ids.push_back( atoi( (*i).c_str()) );
+    }
   }
 }
 
 User::~User() {
-  delete monitor_ids;
+  monitor_ids.clear();
+}
+
+void User::Copy( const User &u ) {
+  strncpy( username, u.username, sizeof(username)-1 );
+  strncpy( password, u.password, sizeof(password)-1 );
+  enabled = u.enabled;
+  stream = u.stream;
+  events = u.events;
+  control = u.control;
+  monitors = u.monitors;
+  system = u.system;
+  monitor_ids = u.monitor_ids;
 }
 
 bool User::canAccess( int monitor_id ) {
-  if ( !monitor_ids ) {
-    return( true );
-  }
-  for ( int i = 0; monitor_ids[i]; i++ ) {
-    if ( monitor_ids[i] == monitor_id ) {
-      return( true );
+  if ( monitor_ids.empty() )
+    return true;
+  
+  for ( std::vector<int>::iterator i = monitor_ids.begin(); i != monitor_ids.end(); ++i ) {
+    if ( *i == monitor_id ) {
+      return true;
     }
   }
-  return( false );
+  return false;
 }
 
 // Function to load a user from username and password
@@ -90,12 +87,12 @@ bool User::canAccess( int monitor_id ) {
 User *zmLoadUser( const char *username, const char *password ) {
   char sql[ZM_SQL_SML_BUFSIZ] = "";
   char safer_username[65]; // current db username size is 32
-  char safer_password[129]; // current db password size is 64
 
   // According to docs, size of safer_whatever must be 2*length+1 due to unicode conversions + null terminator.
   mysql_real_escape_string(&dbconn, safer_username, username, strlen( username ) );
 
   if ( password ) {
+    char safer_password[129]; // current db password size is 64
     mysql_real_escape_string(&dbconn, safer_password, password, strlen( password ) );
     snprintf( sql, sizeof(sql), "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Username = '%s' and Password = password('%s') and Enabled = 1", safer_username, safer_password );
   } else {
diff --git a/src/zm_user.h b/src/zm_user.h
index 648ef21db..725acbfa2 100644
--- a/src/zm_user.h
+++ b/src/zm_user.h
@@ -36,8 +36,8 @@
 #include <openssl/md5.h>
 #endif // HAVE_L || HAVE_LIBCRYPTO
 
-class User
-{
+#include <vector>
+class User {
 public:
   typedef enum { PERM_NONE=1, PERM_VIEW, PERM_EDIT } Permission;
 
@@ -50,12 +50,17 @@ protected:
   Permission control;
   Permission monitors;
   Permission system;
-  int *monitor_ids;
+  std::vector<int> monitor_ids;
 
 public:
   User();
-  User( MYSQL_ROW &dbrow );
+  explicit User( MYSQL_ROW &dbrow );
   ~User();
+  User( User &u ) { Copy(u); }
+  void Copy( const User &u );
+  User operator=(const User &u) {
+    Copy(u); return *this;
+  }
 
   const char *getUsername() const { return( username ); }
   const char *getPassword() const { return( password ); }
diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp
index f6ce68089..9ba8cc420 100644
--- a/src/zm_utils.cpp
+++ b/src/zm_utils.cpp
@@ -49,8 +49,7 @@ std::string trimSet(std::string str, std::string trimset) {
     return str.substr( startpos, endpos-startpos+1 );
 }
 
-std::string trimSpaces(std::string str)
-{
+std::string trimSpaces(std::string str) {
   return trimSet(str, " \t");
 }
 
@@ -80,7 +79,7 @@ const std::string stringtf( const char *format, ... )
   return( tempString );
 }
 
-const std::string stringtf( const std::string &format, ... )
+const std::string stringtf( const std::string format, ... )
 {
   va_list ap;
   char tempBuffer[8192];
@@ -100,7 +99,7 @@ bool startsWith( const std::string &haystack, const std::string &needle )
   return( haystack.substr( 0, needle.length() ) == needle );
 }
 
-StringVector split( const std::string &string, const std::string chars, int limit )
+StringVector split( const std::string &string, const std::string &chars, int limit )
 {
   StringVector stringVector;
   std::string tempString = string;
@@ -134,7 +133,7 @@ StringVector split( const std::string &string, const std::string chars, int limi
   return( stringVector );
 }
 
-const std::string join(const StringVector v, const char * delim ) {
+const std::string join(const StringVector &v, const char * delim ) {
   std::stringstream ss;
 
   for(size_t i = 0; i < v.size(); ++i) {
@@ -209,10 +208,9 @@ int split(const char* string, const char delim, std::vector<std::string>& items)
     return -2;
 
   std::string str(string);
-  size_t pos;
   
   while(true) {
-    pos = str.find(delim);
+    size_t pos = str.find(delim);
     items.push_back(str.substr(0, pos));
     str.erase(0, pos+1);
 
diff --git a/src/zm_utils.h b/src/zm_utils.h
index 961389611..a10c89f48 100644
--- a/src/zm_utils.h
+++ b/src/zm_utils.h
@@ -33,11 +33,11 @@ std::string trimSet(std::string str, std::string trimset);
 std::string replaceAll(std::string str, std::string from, std::string to);
 
 const std::string stringtf( const char *format, ... );
-const std::string stringtf( const std::string &format, ... );
+const std::string stringtf( const std::string format, ... );
 
 bool startsWith( const std::string &haystack, const std::string &needle );
-StringVector split( const std::string &string, const std::string chars, int limit=0 );
-const std::string join( const StringVector, const char * );
+StringVector split( const std::string &string, const std::string &chars, int limit=0 );
+const std::string join( const StringVector &, const char * );
 
 const std::string base64Encode( const std::string &inString );
 
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index c8704eae0..e6c4769b1 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -167,7 +167,11 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
         video_out_ctx->time_base.den);
 
   if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+    video_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
     video_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
   }
 
   Monitor::Orientation orientation = monitor->getOrientation();
@@ -274,7 +278,11 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
 
     if (audio_out_stream) {
       if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
-        audio_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+    audio_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
+    audio_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
       }
     }
   }  // end if audio_in_stream
diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 2bfdb404b..d84af6036 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -204,7 +204,6 @@ bool Zone::CheckAlarms( const Image *delta_image ) {
   int diff_width = diff_image->Width();
   uint8_t* diff_buff = (uint8_t*)diff_image->Buffer();
   uint8_t* pdiff;
-  const uint8_t* ppoly;
 
   unsigned int pixel_diff_count = 0;
 
@@ -267,6 +266,7 @@ bool Zone::CheckAlarms( const Image *delta_image ) {
     int bx1 = bx-1;
     int by1 = by-1;
 
+
     Debug( 5, "Checking for filtered pixels" );
     if ( bx > 1 || by > 1 ) {
       // Now remove any pixels smaller than our filter size
@@ -679,7 +679,7 @@ bool Zone::CheckAlarms( const Image *delta_image ) {
           }
         }
 
-        ppoly = pg_image->Buffer( lo_x2, y );
+        const uint8_t* ppoly = pg_image->Buffer( lo_x2, y );
         for ( int x = lo_x2; x <= hi_x2; x++, pdiff++, ppoly++ ) {
           if ( !*ppoly ) {
             *pdiff = BLACK;
@@ -946,13 +946,9 @@ bool Zone::DumpSettings( char *output, bool /*verbose*/ ) {
 void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum) {
   uint32_t pixelsalarmed = 0;
   uint32_t pixelsdifference = 0;
-  uint8_t *pdiff;
-  const uint8_t *ppoly;
   uint8_t calc_max_pixel_threshold = 255;
   unsigned int lo_y;
   unsigned int hi_y;
-  unsigned int lo_x;
-  unsigned int hi_x;
 
   if(max_pixel_threshold)
     calc_max_pixel_threshold = max_pixel_threshold;
@@ -960,12 +956,12 @@ void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsig
   lo_y = polygon.LoY();
   hi_y = polygon.HiY();
   for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
-    lo_x = ranges[y].lo_x;
-    hi_x = ranges[y].hi_x;
+    unsigned int lo_x = ranges[y].lo_x;
+    unsigned int hi_x = ranges[y].hi_x;
 
     Debug( 7, "Checking line %d from %d -> %d", y, lo_x, hi_x );
-    pdiff = (uint8_t*)pdiff_image->Buffer( lo_x, y );
-    ppoly = ppoly_image->Buffer( lo_x, y );
+    uint8_t *pdiff = (uint8_t*)pdiff_image->Buffer( lo_x, y );
+    const uint8_t *ppoly = ppoly_image->Buffer( lo_x, y );
 
     for ( unsigned int x = lo_x; x <= hi_x; x++, pdiff++, ppoly++ ) {
       if ( *ppoly && (*pdiff > min_pixel_threshold) && (*pdiff <= calc_max_pixel_threshold) ) {
diff --git a/src/zmc.cpp b/src/zmc.cpp
index 7c0995621..bafd4faf6 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -161,7 +161,7 @@ int main(int argc, char *argv[]) {
     Usage();
   }
 
-  int modes = (device[0]?1:0 + host[0]?1:0 + file[0]?1:0 + (monitor_id > 0 ? 1 : 0));
+  int modes = ( (device[0]?1:0) + (host[0]?1:0) + (file[0]?1:0) + (monitor_id > 0 ? 1 : 0));
   if ( modes > 1 ) {
     fprintf(stderr, "Only one of device, host/port/path, file or monitor id allowed\n");
     Usage();
diff --git a/src/zmf.cpp b/src/zmf.cpp
deleted file mode 100644
index fac1b76c8..000000000
--- a/src/zmf.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-//
-// ZoneMinder Image File Writer Implementation, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-/*
-
-=head1 NAME
-
-zmf - The ZoneMinder Frame daemon
-
-=head1 SYNOPSIS
-
- zmf -m <monitor_id>
- zmf --monitor <monitor_id>
- zmf -h
- zmf --help
- zmf -v
- zmf --version
-
-=head1 DESCRIPTION
-
-This is an optional daemon that can run in concert with the Analysis daemon and
-whose function it is to actually write captured frames to disk. This frees up
-the Analysis daemon to do more analysis (!) and so keep up with the Capture
-daemon better. If it isn't running or dies then the Analysis daemon just writes
-them itself. 
-
-=head1 OPTIONS
-
- -m, --monitor_id                 - ID of the monitor to use
- -h, --help                       - Display usage information
- -v, --version                    - Print the installed version of ZoneMinder
-
-=cut
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <getopt.h>
-#include <signal.h>
-
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_signal.h"
-#include "zm_monitor.h"
-
-#include "zmf.h"
-
-int OpenSocket( int monitor_id )
-{
-	int sd = socket( AF_UNIX, SOCK_STREAM, 0);
-	if ( sd < 0 )
-	{
-		Error( "Can't create socket: %s", strerror(errno) );
-		return( -1 );
-	}
-
-	char sock_path[PATH_MAX] = "";
-	snprintf( sock_path, sizeof(sock_path), "%s/zmf-%d.sock", config.path_socks, monitor_id );
-	if ( unlink( sock_path ) < 0 )
-	{
-		Warning( "Can't unlink '%s': %s", sock_path, strerror(errno) );
-	}
-
-	struct sockaddr_un addr;
-
-	strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
-	addr.sun_family = AF_UNIX;
-
-	if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
-	{
-		Error( "Can't bind: %s", strerror(errno) );
-		exit( -1 );
-	}
-
-	if ( listen( sd, SOMAXCONN ) < 0 )
-	{
-		Error( "Can't listen: %s", strerror(errno) );
-		return( -1 );
-	}
-
-	struct sockaddr_un rem_addr;
-	socklen_t rem_addr_len = sizeof(rem_addr);
-	int new_sd = -1;
-	if ( (new_sd = accept( sd, (struct sockaddr *)&rem_addr, &rem_addr_len )) < 0 )
-	{
-		Error( "Can't accept: %s", strerror(errno) );
-		exit( -1 );
-	}
-	close( sd );
-
-	sd = new_sd;
-
-	Info( "Frame server socket open, awaiting images" );
-	return( sd );
-}
-
-int ReopenSocket( int &sd, int monitor_id )
-{
-	close( sd );
-	return( sd = OpenSocket( monitor_id ) );
-}
-
-void Usage()
-{
-	fprintf( stderr, "zmf -m <monitor_id>\n" );
-	fprintf( stderr, "Options:\n" );
-	fprintf( stderr, "  -m, --monitor <monitor_id>   : Specify which monitor to use\n" );
-	fprintf( stderr, "  -h, --help                   : This screen\n" );
-	fprintf( stderr, "  -v, --version                : Report the installed version of ZoneMinder\n" );
-	exit( 0 );
-}
-
-int main( int argc, char *argv[] )
-{
-  self = argv[0];
-
-  srand( getpid() * time( 0 ) );
-
-  int id = -1;
-
-  static struct option long_options[] = {
-    {"monitor", 1, 0, 'm'},
-    {"help", 0, 0, 'h'},
-    {"version", 0, 0, 'v'},
-    {0, 0, 0, 0}
-  };
-
-  while (1)
-  {
-    int option_index = 0;
-
-    int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
-    if (c == -1)
-    {
-      break;
-    }
-
-    switch (c)
-    {
-      case 'm':
-        id = atoi(optarg);
-        break;
-      case 'h':
-      case '?':
-        Usage();
-        break;
-      case 'v':
-        std::cout << ZM_VERSION << "\n";
-        exit(0);
-      default:
-        //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-        break;
-    }
-  }
-
-  if (optind < argc)
-  {
-    fprintf( stderr, "Extraneous options, " );
-    while (optind < argc)
-      printf ("%s ", argv[optind++]);
-    printf ("\n");
-    Usage();
-  }
-
-  if ( id < 0 )
-  {
-    fprintf( stderr, "Bogus monitor %d\n", id );
-    Usage();
-    exit( 0 );
-  }
-
-  char log_id_string[16];
-  snprintf( log_id_string, sizeof(log_id_string), "m%d", id );
-
-  zmLoadConfig();
-
-  logInit( "zmf" );
-  
-  hwcaps_detect();
-
-  Monitor *monitor = Monitor::Load( id, false, Monitor::QUERY );
-
-  if ( !monitor )
-  {
-    fprintf( stderr, "Can't find monitor with id of %d\n", id );
-    exit( -1 );
-  }
-
-  Storage *Storage = monitor->getStorage();
-
-  char capt_path[PATH_MAX];
-  char anal_path[PATH_MAX];
-  snprintf( capt_path, sizeof(capt_path), "%s/%d/%%s/%%0%dd-capture.jpg", Storage->Path(), monitor->Id(), config.event_image_digits );
-  snprintf( anal_path, sizeof(anal_path), "%s/%d/%%s/%%0%dd-analyse.jpg", Storage->Path(), monitor->Id(), config.event_image_digits );
-  zmSetDefaultTermHandler();
-  zmSetDefaultDieHandler();
-
-  sigset_t block_set;
-  sigemptyset( &block_set );
-
-  int sd = OpenSocket( monitor->Id() );
-
-  FrameHeader frame_header = { 0, 0, false, 0 };
-  //unsigned char *image_data = 0;
-
-  fd_set rfds;
-
-  struct timeval timeout;
-  timeout.tv_sec = 1;
-  timeout.tv_usec = 0;
-  while( 1 )
-  {
-    struct timeval temp_timeout = timeout;
-
-    FD_ZERO(&rfds);
-    FD_SET(sd, &rfds);
-    int n_found = select( sd+1, &rfds, NULL, NULL, &temp_timeout );
-    if( n_found == 0 )
-    {
-      Debug( 1, "Select timed out" );
-      continue;
-    }
-    else if ( n_found < 0)
-    {
-      Error( "Select error: %s", strerror(errno) );
-      ReopenSocket( sd, monitor->Id() );
-      continue;
-    }
-
-    sigprocmask( SIG_BLOCK, &block_set, 0 );
-
-    int n_bytes = read( sd, &frame_header, sizeof(frame_header) );
-    if ( n_bytes != sizeof(frame_header) )
-    {
-      if ( n_bytes < 0 )
-      {
-        Error( "Can't read frame header: %s", strerror(errno) );
-      }
-      else if ( n_bytes > 0 )
-      {
-        Error( "Incomplete read of frame header, %d bytes only", n_bytes );
-      }
-      else
-      {
-        Warning( "Socket closed at remote end" );
-      }
-      ReopenSocket( sd, monitor->Id() );
-      continue;
-    }
-    Debug( 1, "Read frame header, expecting %ld bytes of image", frame_header.image_length );
-    static unsigned char image_data[ZM_MAX_IMAGE_SIZE];
-
-        // Read for pipe and loop until bytes expected have been read or an error occurs
-        int bytes_read = 0;
-        do
-    {
-            n_bytes = read( sd, image_data+bytes_read, frame_header.image_length-bytes_read );
-            if (n_bytes < 0) break; // break on error
-            if (n_bytes < (int)frame_header.image_length)
-      {
-                // print some informational messages 
-                if (bytes_read == 0)
-                {
-			Debug(4,"Image read : Short read %d bytes of %d expected bytes",n_bytes,frame_header.image_length);
-                                }
-                               else if (bytes_read+n_bytes == (int)frame_header.image_length)
-                                {
-                                        Debug(5,"Image read : Read rest of short read: %d bytes read total of %d bytes",n_bytes,frame_header.image_length);
-                                }
-                                else
-                                {
-                                        Debug(6,"Image read : continuing, read %d bytes (%d so far)", n_bytes, bytes_read+n_bytes);
-                                }
-                       }
-                        bytes_read+= n_bytes;
-                } while (n_bytes>0 && (bytes_read < (ssize_t)frame_header.image_length) );
-
-                // Print errors if there was a problem
-                if ( n_bytes < 1 )
-                {
-
-                        Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
-                        if ( n_bytes < 0 )
-			{
-                                Error( "Can't read frame image data: %s", strerror(errno) );
-			}
-			else
-			{
-				Warning( "Socket closed at remote end" );
-			}
-			ReopenSocket( sd, monitor->Id() );
-			continue;
-		}
-
-		static char subpath[PATH_MAX] = "";
-                if ( config.use_deep_storage )
-                {
-                    struct tm *time = localtime( &frame_header.event_time );
-                    snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
-                }
-                else
-                {
-                    snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
-                }
-
-		static char path[PATH_MAX] = "";
-		snprintf( path, sizeof(path), frame_header.alarm_frame?anal_path:capt_path, subpath, frame_header.frame_id );
-		Debug( 1, "Got image, writing to %s", path );
-
-		FILE *fd = 0;
-		if ( (fd = fopen( path, "w" )) < 0 )
-		{
-			Error( "Can't fopen '%s': %s", path, strerror(errno) );
-			exit( -1 );
-		}
-		if ( 0 == fwrite( image_data, frame_header.image_length, 1, fd ) )
-		{
-			Error( "Can't fwrite image data: %s", strerror(errno) );
-			exit( -1 );
-		}
-		fclose( fd );
-
-		sigprocmask( SIG_UNBLOCK, &block_set, 0 );
-	}
-	logTerm();
-	zmDbClose();
-}
diff --git a/src/zms.cpp b/src/zms.cpp
index d8fc0a86c..b78b20c66 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -84,12 +84,6 @@ int main( int argc, const char *argv[] ) {
   
   zmLoadConfig();
 
-  logInit( "zms" );
-  
-  hwcaps_detect();
-
-  zmSetDefaultTermHandler();
-  zmSetDefaultDieHandler();
 
   const char *query = getenv( "QUERY_STRING" );
   if ( query ) {
@@ -175,6 +169,14 @@ int main( int argc, const char *argv[] ) {
     } // end foreach parm
   } // end if query
 
+  char log_id_string[32] = "zms";
+  if ( monitor_id ) {
+    snprintf(log_id_string, sizeof(log_id_string), "zms_m%d", monitor_id);
+  } else {
+    snprintf(log_id_string, sizeof(log_id_string), "zms_e%d", event_id);
+  }
+  logInit( log_id_string );
+
   if ( config.opt_use_auth ) {
     User *user = 0;
 
@@ -205,6 +207,10 @@ int main( int argc, const char *argv[] ) {
     ValidateAccess( user, monitor_id );
   }
 
+  hwcaps_detect();
+  zmSetDefaultTermHandler();
+  zmSetDefaultDieHandler();
+
   setbuf( stdout, 0 );
   if ( nph ) {
     fprintf( stdout, "HTTP/1.0 200 OK\r\n" );
diff --git a/src/zmu.cpp b/src/zmu.cpp
index 7333e477e..46ba35ac6 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -693,8 +693,7 @@ int main( int argc, char *argv[] ) {
         Error( "Can't use query result: %s", mysql_error( &dbconn ) );
         exit( mysql_errno( &dbconn ) );
       }
-      int n_monitors = mysql_num_rows( result );
-      Debug( 1, "Got %d monitors", n_monitors );
+      Debug( 1, "Got %d monitors", mysql_num_rows( result ) );
 
       printf( "%4s%5s%6s%9s%14s%6s%6s%8s%8s\n", "Id", "Func", "State", "TrgState", "LastImgTim", "RdIdx", "WrIdx", "LastEvt", "FrmRate" );
       for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) {
diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 5034f0fb9..d2408da14 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -8,6 +8,13 @@ exit;
 
 fi
 
+DEBUILD=`which debuild`;
+
+if [ "$DEBUILD" == "" ]; then
+  echo "You must install the devscripts package.  Try sudo apt-get install devscripts";
+  exit;
+fi
+
 for i in "$@"
 do
 case $i in
diff --git a/utils/generate_apache_config.pl b/utils/generate_apache_config.pl
index 7fac19bc3..9d9e94e10 100755
--- a/utils/generate_apache_config.pl
+++ b/utils/generate_apache_config.pl
@@ -37,6 +37,8 @@ if ( $$opts{protocol} eq 'https' ) {
     die "https requires a server_name";
   }
   $VirtualHostPorts = ' *:443';
+} else {
+  $VirtualHostPorts = ' *:80';
 }
 
 
diff --git a/web/ajax/status.php b/web/ajax/status.php
index 6827b7e79..3941a5645 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -137,6 +137,17 @@ $statusData = array(
                   //'Path' => array( 'postFunc' => 'getEventPath' ),
                   ),
                   ),
+                  'frames' => array(
+                      'permission' => 'Events',
+                      'table' => 'Frames',
+                      'selector' => 'EventId',
+                      'elements' => array(
+                        'EventId' => true,
+                        'FrameId' => true,
+                        'Type' => true,
+                        'Delta' => true,
+                      ),
+                  ),
                   'frame' => array(
                       'permission' => 'Events',
                       'table' => 'Frames',
diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index f3e054c42..b5a17d461 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -34,17 +34,13 @@ public function beforeFilter() {
 	public function index() {
 		$this->Event->recursive = -1;
 		
-                $allowedMonitors=preg_split ('@,@', $this->Session->Read('allowedMonitors'),NULL, PREG_SPLIT_NO_EMPTY);
-
-                if (!empty($allowedMonitors))
-                {
-                        $mon_options = array('Event.MonitorId' => $allowedMonitors);
-                }
-                else
-                {
-                        $mon_options='';
-                }
+    $allowedMonitors=preg_split ('@,@', $this->Session->Read('allowedMonitors'),NULL, PREG_SPLIT_NO_EMPTY);
 
+    if (!empty($allowedMonitors)) {
+      $mon_options = array('Event.MonitorId' => $allowedMonitors);
+    } else {
+      $mon_options='';
+    }
 
 		if ($this->request->params['named']) {	
 			$this->FilterComponent = $this->Components->load('Filter');
@@ -81,7 +77,6 @@ public function beforeFilter() {
 			//$thumbData = $this->createThumbnail($value['Event']['Id']);
 			$thumbData = "";
 			$events[$key]['thumbData'] = $thumbData;
-
 		}
 
 		$this->set(compact('events'));
diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index a0a4c8c6b..9ad487917 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -35,22 +35,24 @@ public function beforeFilter() {
  * @return void
  */
 	public function index() {
-                $this->Monitor->recursive = 0;
-		$allowedMonitors=preg_split ('@,@', $this->Session->Read('allowedMonitors'),NULL, PREG_SPLIT_NO_EMPTY);
+    $this->Monitor->recursive = 0;
 		
-		if (!empty($allowedMonitors))
-		{
-			$options = array('conditions'=>array('Monitor.Id'=> $allowedMonitors));
+		if ($this->request->params['named']) {	
+			$this->FilterComponent = $this->Components->load('Filter');
+			$conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
+		} else {
+			$conditions = array();
 		}
-		else
-		{
-			$options='';
+
+		$allowedMonitors=preg_split ('@,@', $this->Session->Read('allowedMonitors'),NULL, PREG_SPLIT_NO_EMPTY);
+		if (!empty($allowedMonitors)) {
+      $conditions['Monitor.Id' ] = $allowedMonitors;
 		}
-        	$monitors = $this->Monitor->find('all',$options);
-        	$this->set(array(
-        	    'monitors' => $monitors,
-        	    '_serialize' => array('monitors')
-        	));
+    $monitors = $this->Monitor->find('all',array('conditions'=>$conditions));
+    $this->set(array(
+          'monitors' => $monitors,
+          '_serialize' => array('monitors')
+          ));
 	}
 
 /**
@@ -122,7 +124,7 @@ public function beforeFilter() {
 		if (!$this->Monitor->exists($id)) {
 			throw new NotFoundException(__('Invalid monitor'));
 		}
-		if ($this->Session->Read('systemPermission') != 'Edit')
+		if ($this->Session->Read('monitorPermission') != 'Edit')
 		{
 			 throw new UnauthorizedException(__('Insufficient privileges'));
 			return;
diff --git a/web/includes/Event.php b/web/includes/Event.php
index 392973a6a..0c9a15b87 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -9,6 +9,7 @@ class Event {
 'StorageId',
 'Name',
 'DiskSpace',
+'SaveJPEGs',
 );
   public function __construct( $IdOrRow = null ) {
     $row = NULL;
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index e7b114dde..edc946c0c 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -14,6 +14,9 @@ private $defaults = array(
 'Width' => null,
 'Height' => null,
 'Orientation' => null,
+'AnalysisFPSLimit'  =>  null,
+'AnalysisFPS' => null,
+'CaptureFPS' => null,
 );
 private $control_fields = array(
   'Name' => '',
@@ -184,11 +187,13 @@ private $control_fields = array(
   }
 
   public function getStreamSrc( $args, $querySep='&amp;' ) {
+
+    $streamSrc = ZM_BASE_PROTOCOL.'://';
     if ( isset($this->{'ServerId'}) and $this->{'ServerId'} ) {
       $Server = new Server( $this->{'ServerId'} );
-      $streamSrc = ZM_BASE_PROTOCOL.'://'.$Server->Hostname();
+      $streamSrc .= $Server->Hostname();
     } else {
-      $streamSrc = ZM_BASE_URL;
+      $streamSrc .= $_SERVER['HTTP_HOST'];
     }
     if ( ZM_MIN_STREAMING_PORT )
       $streamSrc .= ':'. (ZM_MIN_STREAMING_PORT+$this->{'Id'});
diff --git a/web/includes/database.php b/web/includes/database.php
index 34387e040..a1bcf66c3 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -134,14 +134,14 @@ function dbQuery( $sql, $params=NULL ) {
     } else {
       $result = $dbConn->query( $sql );
     }
-if ( 0 ) {
+if ( 1 ) {
     if ( $params )
       Warning("SQL: $sql" . implode(',',$params) . ' rows: '.$result->rowCount() );
     else
       Warning("SQL: $sql: rows:" . $result->rowCount()  );
 }
   } catch(PDOException $e) {
-    Error( "SQL-ERR '".$e->getMessage()."', statement was '".$sql."' params:" . $params?implode(',',$params):'' );
+    Error( "SQL-ERR '".$e->getMessage()."', statement was '".$sql."' params:" . ($params?implode(',',$params):'') );
   }
   return( $result );
 }
diff --git a/web/includes/functions.php b/web/includes/functions.php
index 8dcab3b42..7bd3df7e9 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -28,13 +28,13 @@ if ( version_compare( phpversion(), '4.3.0', '<') ) {
 }
 
 # We are requiring these because this file is getting included from the api, which hasn't already included them.
-require_once( 'logger.php' );
-require_once( 'database.php' );
+require_once('logger.php');
+require_once('database.php');
 
 function userLogin( $username, $password='', $passwordHashed=false ) {
   global $user, $cookies;
 
-  $sql = 'SELECT * FROM Users WHERE Enabled = 1';
+  $sql = 'SELECT * FROM Users WHERE Enabled=1';
   $sql_values = NULL;
   if ( ZM_AUTH_TYPE == 'builtin' ) {
     if ( $passwordHashed ) {
@@ -44,7 +44,7 @@ function userLogin( $username, $password='', $passwordHashed=false ) {
     }
     $sql_values = array( $username, $password );
   } else {
-    $sql .= ' AND Username = ?';
+    $sql .= ' AND Username=?';
     $sql_values = array( $username );
   }
   $_SESSION['username'] = $username;
@@ -138,26 +138,27 @@ function getAuthUser( $auth ) {
         $authHash = md5( $authKey );
 
         if ( $auth == $authHash ) {
-          return( $user );
+          return $user;
         }
       } // end foreach hour
     } // end foreach user
   } // end if using auth hash
   Error( "Unable to authenticate user from auth hash '$auth'" );
   return( false );
-}
+} // end getAuthUser($auth)
 
 function generateAuthHash( $useRemoteAddr ) {
   if ( ZM_OPT_USE_AUTH and ZM_AUTH_RELAY == 'hashed' and isset($_SESSION['username']) and $_SESSION['passwordHash'] ) {
     # regenerate a hash at half the liftetime of a hash, an hour is 3600 so half is 1800
-    if ( ( ! isset($_SESSION['AuthHash']) ) or ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) ) {
+    $time = time();
+    if ( ( ! isset($_SESSION['AuthHash']) ) or ( $_SESSION['AuthHashGeneratedAt'] < ( $time - ( ZM_AUTH_HASH_TTL * 1800 ) ) ) ) {
       # Don't both regenerating Auth Hash if an hour hasn't gone by yet
-      $time = localtime();
+      $local_time = localtime();
       $authKey = '';
       if ( $useRemoteAddr ) {
-        $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
+        $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
       } else {
-        $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
+        $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
       }
       $auth = md5( $authKey );
       if ( session_status() == PHP_SESSION_NONE ) {
@@ -167,10 +168,10 @@ function generateAuthHash( $useRemoteAddr ) {
         Warning("Session is not active. AuthHash will not be cached. called from $file:$line");
       }
       $_SESSION['AuthHash'] = $auth;
-      $_SESSION['AuthHashGeneratedAt'] = time();
+      $_SESSION['AuthHashGeneratedAt'] = $time;
       Logger::Debug("Generated new auth $auth at " . $_SESSION['AuthHashGeneratedAt']. " using $authKey" );
     } else {
-      Logger::Debug( "Using cached auth " . $_SESSION['AuthHash'] );
+      Logger::Debug( "Using cached auth " . $_SESSION['AuthHash'] ." beacuse " . $_SESSION['AuthHashGeneratedAt'] . ' < '. $time . ' - ' .  ZM_AUTH_HASH_TTL . ' * 1800 = '.( $time - (ZM_AUTH_HASH_TTL * 1800) ));
     } # end if AuthHash is not cached
     return $_SESSION['AuthHash'];
   } else {
@@ -339,11 +340,11 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
 }
 
 function outputImageStream( $id, $src, $width, $height, $title='' ) {
-  echo getImageStream( $id, $src, $width, $height, $title );
+  echo getImageStreamHTML( $id, $src, $width, $height, $title );
 }
 
 
-function getImageStream( $id, $src, $width, $height, $title='' ) {
+function getImageStreamHTML( $id, $src, $width, $height, $title='' ) {
   if ( canStreamIframe() ) {
       return '<iframe id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" '.($width? ' width="'. validInt($width).'"' : '').($height?' height="'.validInt($height).'"' : '' ).'/>';
   } else {
@@ -1239,12 +1240,18 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
               $value = dbEscape($value);
               break;
             case 'DateTime':
+            case 'StartDateTime':
+            case 'EndDateTime':
               $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
               break;
             case 'Date':
+            case 'StartDate':
+            case 'EndDate':
               $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
               break;
             case 'Time':
+            case 'StartTime':
+            case 'EndTime':
               $value = "extract( hour_second from '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
               break;
             default :
@@ -1281,13 +1288,15 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
           case 'IS NOT' :
             $filter['sql'] .= " IS NOT $value";
             break;
+          default:
+            Warning("Invalid operator in filter: " . $terms[$i]['op'] );
         }
 
         $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][op]").'='.urlencode($terms[$i]['op']);
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][op]\" value=\"".htmlspecialchars($terms[$i]['op'])."\"/>\n";
         $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][val]").'='.urlencode($terms[$i]['val']);
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][val]\" value=\"".htmlspecialchars($terms[$i]['val'])."\"/>\n";
-      }
+      } // end foreach term
       if ( isset($terms[$i]['cbr']) ) {
         $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cbr]").'='.urlencode($terms[$i]['cbr']);
         $filter['sql'] .= ' '.str_repeat( ')', $terms[$i]['cbr'] ).' ';
@@ -1302,13 +1311,14 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
   }
 }
 
+// Please note that the filter is passed in by copy, so you need to use the return value from this function.
+//
 function addFilterTerm( $filter, $position, $term=false ) {
   if ( $position < 0 )
     $position = 0;
   
   if ( ! isset( $filter['Query']['terms'] ) )
     $filter['Query']['terms'] = array();
-
   elseif( $position > count($filter['Query']['terms']) )
     $position = count($filter['Query']['terms']);
   if ( $term && $position == 0 )
@@ -1440,6 +1450,66 @@ function getDiskBlocks() {
   return( $space );
 }
 
+function systemStats() {
+
+    $load = getLoad();
+    $diskPercent = getDiskPercent();
+    $pathMapPercent = getDiskPercent(ZM_PATH_MAP);
+    $cpus = getcpus();
+
+    $normalized_load = $load / $cpus;
+
+    # Colorize the system load stat
+    if ( $normalized_load <= 0.75 ) {
+        $htmlLoad=$load;
+    } elseif ( $normalized_load <= 0.9 ) {
+        $htmlLoad="<span class=\"warning\">$load</span>";
+    } elseif ( $normalized_load <= 1.1 ) {
+        $htmlLoad="<span class=\"error\">$load</span>";
+    } else {
+        $htmlLoad="<span class=\"critical\">$load</span>";
+    }
+
+    # Colorize the disk space stat
+    if ( $diskPercent < 98 ) {
+        $htmlDiskPercent="$diskPercent%";
+    } elseif ( $diskPercent <= 99 ) {
+        $htmlDiskPercent="<span class=\"warning\">$diskPercent%</span>";
+    } else {
+        $htmlDiskPercent="<span class=\"error\">$diskPercent%</span>";
+    }
+
+    # Colorize the PATH_MAP (usually /dev/shm) stat
+    if ( $pathMapPercent < 90 ) {
+        if ( disk_free_space(ZM_PATH_MAP) > 209715200 ) { # have to always have at least 200MiB free
+            $htmlPathMapPercent="$pathMapPercent%";
+        } else {
+            $htmlPathMapPercent="<span class=\"warning\">$pathMapPercent%</span>";
+        }
+    } elseif ( $pathMapPercent < 100 ) {
+        $htmlPathMapPercent="<span class=\"warning\">$pathMapPercent%</span>";
+    } else {
+        $htmlPathMapPercent="<span class=\"critical\">$pathMapPercent%</span>";
+    }
+
+    $htmlString = translate('Load').": $htmlLoad - ".translate('Disk').": $htmlDiskPercent - ".ZM_PATH_MAP.": $htmlPathMapPercent";
+
+    return( $htmlString );
+}
+
+function getcpus() {
+
+    if (is_readable("/proc/cpuinfo") ) { # Works on Linux
+        preg_match_all('/^processor/m', file_get_contents('/proc/cpuinfo'), $matches); 
+        $num_cpus = count($matches[0]);
+    } else { # Works on BSD
+        $matches = explode(":", shell_exec("sysctl hw.ncpu"));
+        $num_cpus = trim($matches[1]);
+    }
+
+    return( $num_cpus );
+}
+
 // Function to fix a problem whereby the built in PHP session handling 
 // features want to put the sid as a hidden field after the form or 
 // fieldset tag, neither of which will work with strict XHTML Basic.
@@ -2067,7 +2137,7 @@ function cache_bust( $file ) {
   # Use the last modified timestamp to create a link that gets a different filename
   # To defeat caching.  Should probably use md5 hash
   $parts = pathinfo($file);
-  $cacheFile = 'cache/'.$parts['filename'].'-'.filemtime($file).'.'.$parts['extension'];
+  $cacheFile = 'cache/'.$parts['filename'].'-'.$_COOKIE['zmCSS'].'-'.filemtime($file).'.'.$parts['extension'];
   if ( file_exists( ZM_PATH_WEB.'/'.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_PATH_WEB.'/'.$cacheFile ) ) {
     return $cacheFile;
   } else {
@@ -2141,18 +2211,17 @@ function validHtmlStr( $input ) {
 function getStreamHTML( $monitor, $options = array() ) {
 
   if ( isset($options['scale']) and $options['scale'] and ( $options['scale'] != 100 ) ) {
+    //Warning("Scale to " . $options['scale'] );
     $options['width'] = reScale( $monitor->Width(), $options['scale'] );
     $options['height'] = reScale( $monitor->Height(), $options['scale'] );
   } else {
-    if ( ! isset( $options['width'] ) ) {
-        $options['width'] = NULL;
-    } else if ( $options['width'] == 100 ) {
+    # scale is empty or 100
+    # There may be a fixed width applied though, in which case we need to leave the height empty
+    if ( ! ( isset($options['width']) and $options['width'] ) ) {
       $options['width'] = $monitor->Width();
-    }
-    if ( ! isset( $options['height'] ) ) {
-        $options['height'] = NULL;
-    } else if ( $options['height'] == 100 ) {
-      $options['height'] = $monitor->Height();
+      if ( ! ( isset($options['height']) and $options['height'] ) ) {
+        $options['height'] = $monitor->Height();
+      }
     }
   }
   if ( ! isset($options['mode'] ) ) {
@@ -2161,17 +2230,24 @@ function getStreamHTML( $monitor, $options = array() ) {
   $options['maxfps'] = ZM_WEB_VIDEO_MAXFPS;
   if ( $monitor->StreamReplayBuffer() )
     $options['buffer'] = $monitor->StreamReplayBuffer();
+  //Warning("width: " . $options['width'] . ' height: ' . $options['height']. ' scale: ' . $options['scale'] );
 
   //FIXME, the width and height of the image need to be scaled.
   if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
-    $streamSrc = $monitor->getStreamSrc( array( 'mode'=>'mpeg', 'scale'=>$options['scale'], 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format' => ZM_MPEG_LIVE_FORMAT ) );
-    return getVideoStream( 'liveStream'.$monitor->Id(), $streamSrc, $options, ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
+    $streamSrc = $monitor->getStreamSrc( array(
+      'mode'=>'mpeg',
+      'scale'=>$options['scale'],
+      'bitrate'=>ZM_WEB_VIDEO_BITRATE,
+      'maxfps'=>ZM_WEB_VIDEO_MAXFPS,
+      'format' => ZM_MPEG_LIVE_FORMAT
+    ) );
+    return getVideoStreamHTML( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
   } else if ( $options['mode'] == 'stream' and canStream() ) {
     $options['mode'] = 'jpeg';
     $streamSrc = $monitor->getStreamSrc( $options );
 
     if ( canStreamNative() )
-      return getImageStream( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], $monitor->Name());
+      return getImageStreamHTML( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], $monitor->Name());
     elseif ( canStreamApplet() )
       // Helper, empty widths and heights really don't work.
       return getHelperStream( 'liveStream'.$monitor->Id(), $streamSrc, 
@@ -2198,6 +2274,7 @@ function getStreamMode( ) {
     $streamMode = 'single';
     Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
   }
+  return $streamMode;
 } // end function getStreamMode
 
 function folder_size($dir) {
diff --git a/web/includes/lang.php b/web/includes/lang.php
index b5dbda09d..0cab566b7 100644
--- a/web/includes/lang.php
+++ b/web/includes/lang.php
@@ -37,7 +37,7 @@ function loadLanguage( $prefix="" )
     $fallbackLangFile = $prefix.'lang/en_gb.php';
     $systemLangFile = $prefix.'lang/'.ZM_LANG_DEFAULT.'.php';
     if ( isset($user['Language']) )
-        $userLangFile = $prefix.$user['Language'].'.php';
+        $userLangFile = $prefix.'lang/'.$user['Language'].'.php';
 
     if ( isset($userLangFile) && file_exists( $userLangFile ) )
         return( $userLangFile );
diff --git a/web/skins/classic/css/classic/skin.css b/web/skins/classic/css/classic/skin.css
index c3e3b070e..1d5af9a16 100644
--- a/web/skins/classic/css/classic/skin.css
+++ b/web/skins/classic/css/classic/skin.css
@@ -63,16 +63,8 @@ p {
     font-weight: normal;
 }
 
-th {
-    font-weight: bold;
-    color: #016A9d;
-}
-
-a:link {
-    color: #7f7fb2;
-    text-decoration: none;
-}
 
+a:link,
 a:visited {
     color: #7f7fb2;
     text-decoration: none;
@@ -83,6 +75,11 @@ a:hover {
     text-decoration: underline;
 }
 
+th, th a {
+    font-weight: bold;
+    color: #016A9d;
+}
+
 input,textarea,select,button {
     border: 1px #7f7fb2 solid;
     font-family: inherit;
diff --git a/web/skins/classic/css/classic/views/console.css b/web/skins/classic/css/classic/views/console.css
index a2477133a..8f90f9eb4 100644
--- a/web/skins/classic/css/classic/views/console.css
+++ b/web/skins/classic/css/classic/views/console.css
@@ -12,6 +12,19 @@
     float: right;
 }
 
+#systemStats .warning {
+    color: orange;
+}
+
+#systemStats .error {
+    color: red;
+}
+
+#systemStats .critical {
+    color: red;
+    text-decoration: blink;
+}
+
 #monitorSummary {
     float: left;
     text-align: left;
diff --git a/web/skins/classic/css/classic/views/event.css b/web/skins/classic/css/classic/views/event.css
index 1a9ed51fa..100f53266 100644
--- a/web/skins/classic/css/classic/views/event.css
+++ b/web/skins/classic/css/classic/views/event.css
@@ -35,6 +35,7 @@ span.noneCue {
 
 #dataBar #dataTable {
     width: 100%;
+    table-layout: fixed;
 }
 
 #dataBar #dataTable td {
@@ -142,32 +143,32 @@ span.noneCue {
 #monitorStatus #monitorState {
 }
 
-.dvrControls {
+#dvrControls {
     margin-top: 3px;
     margin-bottom: 2px;
     text-align: center;
 }
 
-.dvrControls input {
-    height: 20px;
-    width: 28px;
-    padding-bottom: 3px;
+#dvrControls input {
+    height: 1.5em;
+    width: 2em;
+    padding: 0 ;
     margin: 0 3px;
 }
 
-.dvrControls input[disabled=disabled] {
+#dvrControls input[disabled=disabled] {
     color: #aaaaaa;
 }
 
-.dvrControls input.active {
+#dvrControls input.active {
     border: 1px solid blue;
 }
 
-.dvrControls input.inactive {
+#dvrControls input.inactive {
     border: 1px solid green;
 }
 
-.dvrControls input.unavail {
+#dvrControls input.unavail {
     border: 1px solid red;
 }
 
@@ -194,20 +195,16 @@ span.noneCue {
 }
 
 #eventStills {
-    width: 100%;
     position: relative;
 }
 
 #eventThumbsPanel {
     position: relative;
-    width: 100%;
-    margin: 4px auto;
     z-index: 1;
 }
 
 #eventThumbs {
     margin: 0 auto;
-    width: 100%;
     overflow: hidden;
     height: 300px;
 }
@@ -227,13 +224,17 @@ span.noneCue {
 
 #eventImagePanel {
     position: absolute;
+    top: 0;
+    left: 0;
     z-index: 10;
+    width: 100%;
 }
 
 #eventImageFrame {
     border: 2px solid gray;
     background-color: white;
     padding: 4px;
+    display: inline-block;
 }
 
 #eventImage {
@@ -243,6 +244,14 @@ span.noneCue {
     margin-top: 2px;
 }
 
+#eventImageBar::after {
+  visibility: hidden;
+  display: block;
+  content: "";
+  clear: both;
+  height: 0;
+}
+
 #eventImageStats {
     float: left;
 }
@@ -258,6 +267,7 @@ span.noneCue {
 
 #eventImageNav {
     position: relative;
+    margin: 4px 0 0 0;
 }
 
 #eventImageNav input {
diff --git a/web/skins/classic/css/classic/views/events.css b/web/skins/classic/css/classic/views/events.css
index 5726e904d..ec4fd1c8a 100644
--- a/web/skins/classic/css/classic/views/events.css
+++ b/web/skins/classic/css/classic/views/events.css
@@ -1,3 +1,7 @@
+.archived {
+    background-color: #f8f8f8;;
+}
+
 #controls {
     height: 16px;
     width: 100%;
diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index 51703babf..1cef117e2 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -518,7 +518,6 @@ input[type=submit]:disabled {
 .sidebar {
   position: absolute;
   top: 0;
-  bottom: 0;
   left: 0;
   z-index: 1000;
   display: block;
diff --git a/web/skins/classic/css/dark/views/console.css b/web/skins/classic/css/dark/views/console.css
index 9de9128b5..e28a15b79 100644
--- a/web/skins/classic/css/dark/views/console.css
+++ b/web/skins/classic/css/dark/views/console.css
@@ -12,6 +12,19 @@
     float: right;
 }
 
+#systemStats .warning {
+    color: orange;
+}
+
+#systemStats .error {
+    color: red;
+}
+
+#systemStats .critical {
+    color: red;
+    text-decoration: blink;
+}
+
 #monitorSummary {
     float: left;
     text-align: left;
diff --git a/web/skins/classic/css/dark/views/event.css b/web/skins/classic/css/dark/views/event.css
index 9e98507d1..b206535d4 100644
--- a/web/skins/classic/css/dark/views/event.css
+++ b/web/skins/classic/css/dark/views/event.css
@@ -39,6 +39,7 @@ span.noneCue {
 
 #dataBar #dataTable {
     width: 100%;
+    table-layout: fixed;
 }
 
 #dataBar #dataTable td {
@@ -124,32 +125,32 @@ span.noneCue {
 #monitorStatus #monitorState {
 }
 
-.dvrControls {
+#dvrControls {
     margin-top: 3px;
     margin-bottom: 2px;
     text-align: center;
 }
 
-.dvrControls input {
-    height: 20px;
-    width: 28px;
-    padding-bottom: 3px;
+#dvrControls input {
+    height: 1.5em;
+    width: 2em;
+    padding: 0;
     margin: 0 3px;
 }
 
-.dvrControls input[disabled=disabled] {
+#dvrControls input[disabled=disabled] {
     color: #aaaaaa;
 }
 
-.dvrControls input.active {
+#dvrControls input.active {
     border: 1px solid blue;
 }
 
-.dvrControls input.inactive {
+#dvrControls input.inactive {
     border: 1px solid green;
 }
 
-.dvrControls input.unavail {
+#dvrControls input.unavail {
     border: 1px solid red;
 }
 
@@ -176,20 +177,17 @@ span.noneCue {
 }
 
 #eventStills {
-    width: 100%;
     position: relative;
 }
 
 #eventThumbsPanel {
     position: relative;
-    width: 100%;
     margin: 4px auto;
     z-index: 1;
 }
 
 #eventThumbs {
     margin: 0 auto;
-    width: 100%;
     overflow: hidden;
     height: 300px;
 }
@@ -209,13 +207,17 @@ span.noneCue {
 
 #eventImagePanel {
     position: absolute;
+    top: 0;
+    left: 0;
     z-index: 10;
+    width: 100%;
 }
 
 #eventImageFrame {
     border: 2px solid gray;
     background-color: white;
     padding: 4px;
+    display: inline-block;
 }
 
 #eventImage {
@@ -225,6 +227,14 @@ span.noneCue {
     margin-top: 2px;
 }
 
+#eventImageBar::after {
+  visibility: hidden;
+  display: block;
+  content: "";
+  clear: both;
+  height: 0;
+}
+
 #eventImageStats {
     float: left;
 }
@@ -240,6 +250,7 @@ span.noneCue {
 
 #eventImageNav {
     position: relative;
+    margin: 4px 0 0 0;
 }
 
 #eventImageNav input {
diff --git a/web/skins/classic/css/dark/views/events.css b/web/skins/classic/css/dark/views/events.css
index 5726e904d..3e3d1b620 100644
--- a/web/skins/classic/css/dark/views/events.css
+++ b/web/skins/classic/css/dark/views/events.css
@@ -1,3 +1,7 @@
+.archived {
+    background-color: #2e2e2e;
+}
+
 #controls {
     height: 16px;
     width: 100%;
diff --git a/web/skins/classic/css/flat/skin.css b/web/skins/classic/css/flat/skin.css
index 2536ed483..e60653a41 100644
--- a/web/skins/classic/css/flat/skin.css
+++ b/web/skins/classic/css/flat/skin.css
@@ -250,6 +250,11 @@ ul.tabList li.active a {
     font-size: 120%;
 }
 
+#content table > tbody > tr:hover
+{
+    background-color: #EEE;
+}
+
 .overlay {
     font-size: 11px;
 }
diff --git a/web/skins/classic/css/flat/views/console.css b/web/skins/classic/css/flat/views/console.css
index 481a14944..fdf1cfb63 100644
--- a/web/skins/classic/css/flat/views/console.css
+++ b/web/skins/classic/css/flat/views/console.css
@@ -12,6 +12,19 @@
     float: right;
 }
 
+#systemStats .warning {
+    color: orange;
+}
+
+#systemStats .error {
+    color: red;
+}
+
+#systemStats .critical {
+    color: red;
+    text-decoration: blink;
+}
+
 #monitorSummary {
     float: left;
     text-align: left;
diff --git a/web/skins/classic/css/flat/views/event.css b/web/skins/classic/css/flat/views/event.css
index 38f57edc5..41cad61dd 100644
--- a/web/skins/classic/css/flat/views/event.css
+++ b/web/skins/classic/css/flat/views/event.css
@@ -35,6 +35,7 @@ span.noneCue {
 
 #dataBar #dataTable {
     width: 100%;
+    table-layout: fixed;
 }
 
 #dataBar #dataTable td {
@@ -129,36 +130,36 @@ span.noneCue {
 #monitorStatus #monitorState {
 }
 
-.dvrControls {
+#dvrControls {
     margin-top: 3px;
     margin-bottom: 2px;
     text-align: center;
 }
 
-.dvrControls input {
+#dvrControls input {
     padding: 10px 10px;
     width: 50px;
     margin: 0 3px;
     font-weight: 900;
 }
 
-.dvrControls input[disabled=disabled] {
+#dvrControls input[disabled=disabled] {
     color: #aaaaaa;
 }
 
-.dvrControls input.active {
+#dvrControls input.active {
     border: 0;
     background-color: #2ecc71;
     color: #fff;
 }
 
-.dvrControls input.inactive {
+#dvrControls input.inactive {
     border: 0;
     background-color: #e67e22;
     color: #fff;
 }
 
-.dvrControls input.unavail {
+#dvrControls input.unavail {
     background-color: #ccc;
     border: 0;
     cursor: default;
@@ -187,20 +188,17 @@ span.noneCue {
 }
 
 #eventStills {
-    width: 100%;
     position: relative;
 }
 
 #eventThumbsPanel {
     position: relative;
-    width: 100%;
-    margin: 4px auto;
+    margin: 0;
     z-index: 1;
 }
 
 #eventThumbs {
     margin: 0 auto;
-    width: 100%;
     overflow: hidden;
     height: 300px;
 }
@@ -220,13 +218,17 @@ span.noneCue {
 
 #eventImagePanel {
     position: absolute;
+    top: 0;
+    left: 0;
     z-index: 10;
+    width: 100%;
 }
 
 #eventImageFrame {
     border: 2px solid gray;
     background-color: white;
     padding: 4px;
+    display: inline-block;
 }
 
 #eventImage {
@@ -249,8 +251,17 @@ span.noneCue {
     float: right;
 }
 
+#eventImageBar::after {
+  visibility: hidden;
+  display: block;
+  content: "";
+  clear: both;
+  height: 0;
+}
+
 #eventImageNav {
     position: relative;
+    margin: 4px 0 0 0;
 }
 
 #eventImageNav input {
diff --git a/web/skins/classic/css/flat/views/events.css b/web/skins/classic/css/flat/views/events.css
index 5726e904d..ec4fd1c8a 100644
--- a/web/skins/classic/css/flat/views/events.css
+++ b/web/skins/classic/css/flat/views/events.css
@@ -1,3 +1,7 @@
+.archived {
+    background-color: #f8f8f8;;
+}
+
 #controls {
     height: 16px;
     width: 100%;
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 46cf2e622..c3d225aa8 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -25,6 +25,7 @@
 var popupOptions = "resizable,scrollbars,status=no,toolbar=yes";
 
 function checkSize() {
+  if ( 0 ) {
   if (window.outerHeight) {
     var w = window.outerWidth;
     var prevW = w;
@@ -37,6 +38,7 @@ function checkSize() {
     if (w != prevW || h != prevH)
       window.resizeTo(w, h);
   }
+  }
 }
 
 // Deprecated
@@ -324,7 +326,7 @@ function changeGroup( e, depth ) {
 }
 function changeMonitor( e ) {
   var monitor_id = e.value;
-  Cookie.write( 'zmMonitorId', monitor_id, { duration: 10*365 } );
+  Cookie.write( 'MonitorId', monitor_id, { duration: 10*365 } );
   window.location = window.location;
 }
 function changeFilter( e ) {
diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index d97f7eff7..b5797a97f 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -59,7 +59,7 @@ if ( ( ! empty($closePopup) ) and ( $closePopup == true ) ) {
 
 var focusWindow = <?php echo !empty($focusWindow)?'true':'false' ?>;
 
-var imagePrefix = "<?php echo viewImagePath( "", '&' ) ?>";
+var imagePrefix = "<?php echo "?view=image&eid=" ?>";
 
 var auth_hash;
 <?php if ( ZM_OPT_USE_AUTH && ZM_AUTH_HASH_LOGINS ) { ?>
diff --git a/web/skins/classic/js/video-js-skin.css b/web/skins/classic/js/video-js-skin.css
index d2a5cc529..f83729e00 100644
--- a/web/skins/classic/js/video-js-skin.css
+++ b/web/skins/classic/js/video-js-skin.css
@@ -1,3 +1,11 @@
+.vjs-tech {
+  pointer-events: none;
+}
+
+.vjs-captions-button {
+  display: none;
+}
+
 .vjs-tt-cue {
   margin-bottom: .75em;
 }
diff --git a/web/skins/classic/views/_monitor_filters.php b/web/skins/classic/views/_monitor_filters.php
index c8607f845..b81634fd4 100644
--- a/web/skins/classic/views/_monitor_filters.php
+++ b/web/skins/classic/views/_monitor_filters.php
@@ -98,23 +98,23 @@ $groupSql = Group::get_group_sql( $group_id );
       if ( $monitors[$i]['Id'] == $monitor_id ) {
         $found_selected_monitor = true;
       }
-    }
+    } // end foreach monitor
     if ( ! $found_selected_monitor ) {
       $monitor_id = '';
     }
-  }
+  } // end if a monitor was specified
+
   for ( $i = 0; $i < count($monitors); $i++ ) {
     if ( !visibleMonitor( $monitors[$i]['Id'] ) ) {
       continue;
     }
-    $monitors_dropdown[$monitors[$i]['Id']] = $monitors[$i]['Name'];
 
     if ( $monitor_id and ( $monitors[$i]['Id'] != $monitor_id ) ) {
       continue;
     }
     $displayMonitors[] = $monitors[$i];
   }
-  echo htmlSelect( 'MonitorId', $monitors_dropdown, $monitor_id, array('onchange'=>'changeMonitor(this);') );
+  echo htmlSelect( 'MonitorId', $monitors_dropdown, $monitor_id, array('onchange'=>'changeFilter(this);') );
 ?>
 </span>
 <?php
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 43214ea1f..5253300a6 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -25,7 +25,7 @@ $eventCounts = array(
   array(
     'title' => translate('Events'),
     'filter' => array(
-      'Query' => array (
+      'Query' => array(
         'terms' => array()
       )
     ),
@@ -114,7 +114,11 @@ for ( $i = 0; $i < count($displayMonitors); $i++ ) {
 
   $counts = array();
   for ( $j = 0; $j < count($eventCounts); $j += 1 ) {
-    $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['Query']['terms']), array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitor['Id'] ) );
+    $filter = addFilterTerm(
+      $eventCounts[$j]['filter'],
+      count($eventCounts[$j]['filter']['Query']['terms']),
+      array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitor['Id'] )
+    );
     parseFilter( $filter );
     $counts[] = 'count(if(1'.$filter['sql'].",1,NULL)) AS EventCount$j, SUM(if(1".$filter['sql'].",DiskSpace,NULL)) As DiskSpace$j";
     $monitor['eventCounts'][$j]['filter'] = $filter;
@@ -127,7 +131,7 @@ for ( $i = 0; $i < count($displayMonitors); $i++ ) {
     $eventCounts[$j]['total'] += $monitor['EventCount'.$j];
   }
   unset($monitor);
-}
+} // end foreach display monitor
 $cycleWidth = $maxWidth;
 $cycleHeight = $maxHeight;
 
@@ -139,6 +143,8 @@ if ( count($servers) ) $left_columns += 1;
 if ( ZM_WEB_ID_ON_CONSOLE ) $left_columns += 1;
 if ( $show_storage_areas ) $left_columns += 1;
 
+return;
+
 xhtmlHeaders( __FILE__, translate('Console') );
 ?>
 <body>
@@ -203,12 +209,15 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 <?php 
   if ( ZM_WEB_ID_ON_CONSOLE ) {
 ?>
-            <td class="colId"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Id'], $running && ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
+            <td class="colId"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Id'], ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
 <?php
   }
 ?>
-            <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
-            <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
+            <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], ($monitor['Function'] != 'None') && canView('Stream') ) ?></td>
+            <td class="colFunction">
+              <?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?><br/>
+<?php echo $monitor['CaptureFPS'] . ( ( $monitor['Function'] == 'Mocord' or $monitor['Function'] == 'Modect' ) ? ' / ' . $monitor['AnalysisFPS'] : '' ) . ' FPS' ?>
+              </td>
 <?php
   if ( count($servers) ) { ?>
             <td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new Server( $monitor['ServerId'] ); echo $Server->Name(); ?></td>
@@ -263,7 +272,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
             <td class="colId"><?php echo count($displayMonitors) ?></td>
             <td class="colLeftButtons" colspan="<?php echo $left_columns -1?>">
               <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
-              <input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
+              <input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor(this);"/>
               <!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
               <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
               <input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/>
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 80d29bdc0..2167b510b 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -131,42 +131,36 @@ if ( canEdit('Events') ) {
         <div id="editEvent"><a href="#" onclick="editEvent()"><?php echo translate('Edit') ?></a></div>
         <div id="archiveEvent"<?php echo $Event->Archived == 1 ? ' class="hidden"' : ''  ?>><a href="#" onclick="archiveEvent()"><?php echo translate('Archive') ?></a></div>
         <div id="unarchiveEvent"<?php echo $Event->Archived == 0 ? ' class="hidden"' : '' ?>><a href="#" onclick="unarchiveEvent()"><?php echo translate('Unarchive') ?></a></div>
-<?php 
+<?php
 } // end if can edit Events
-  if ( $Event->DefaultVideo() ) { ?>
-        <div id="downloadEventFile"><a href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'))?>">Download MP4</a></div>
+?>
+        <div id="framesEvent"><a href="#" onclick="showEventFrames()"><?php echo translate('Frames') ?></a></div>
+        <div id="streamEvent" class="hidden"><a href="#" onclick="showStream()"><?php echo translate('Stream') ?></a></div>
+        <div id="stillsEvent"><a href="#" onclick="showStills()"><?php echo translate('Stills') ?></a></div>
+<?php
+  if ( $Event->DefaultVideo() ) { 
+?>
+        <div id="downloadEventFile"><a href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'))?>" download>Download MP4</a></div>
+<?php
+  } else {
+?>
+        <div id="videoEvent"><a href="#" onclick="videoEvent();"><?php echo translate('Video') ?></a></div>
 <?php
   } // end if Event->DefaultVideo
 ?>
-        <div id="framesEvent"><a href="#" onclick="showEventFrames()"><?php echo translate('Frames') ?></a></div>
-<?php
-if ( $Event->SaveJPEGs() & 3 ) { // Analysis or Jpegs
-?>
-        <div id="stillsEvent"<?php if ( $streamMode == 'still' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStills()"><?php echo translate('Stills') ?></a></div>
-<?php
-} // has frames or analysis
-?>
-        <div id="videoEvent"><a href="#" onclick="videoEvent();"><?php echo translate('Video') ?></a></div>
         <div id="exportEvent"><a href="#" onclick="exportEvent();"><?php echo translate('Export') ?></a></div>
       </div>
+      <div id="eventVideo" class="">
 <?php
 if ( $Event->DefaultVideo() ) {
 ?>
-      <div id="eventVideo" class="">
         <div id="videoFeed">
-          <video id="videoobj" class="video-js vjs-default-skin" width="<?php echo reScale( $Event->Width(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $scale ) ?>" data-setup='{ "controls": true, "playbackRates": [0.5, 1, 1.5, 2, 4, 8, 16, 32, 64, 128, 256], "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'>
+          <video id="videoobj" class="video-js vjs-default-skin" style="transform: matrix(1, 0, 0, 1, 0, 0)" width="<?php echo reScale( $Event->Width(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $scale ) ?>" data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'>
           <source src="<?php echo $Event->getStreamSrc( array( 'mode'=>'mpeg','format'=>'h264' ) ); ?>" type="video/mp4">
           <track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default>
           Your browser does not support the video tag.
           </video>
-        </div>
-        <!--script>includeVideoJs();</script-->
-
-      <p id="dvrControls" class="dvrControls">
-        <input type="button" value="&lt;+" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" onclick="streamPrev( true );"/>
-        <input type="button" value="+&gt;" id="nextBtn" title="<?php echo translate('Next') ?>" class="inactive" onclick="streamNext( true );"/>
-      </p>
-      </div><!--eventVideo-->
+        </div><!--videoFeed-->
 <?php
 }  // end if DefaultVideo
 ?>
@@ -190,29 +184,26 @@ Warning("Streamsrc: $streamSrc");
         <div id="progressBar" style="width: <?php echo reScale($Event->Width(), $scale);?>px;">
           <div class="progressBox" id="progressBox" title="" style="width: 0%;"></div>
         </div><!--progressBar-->
-        <p id="dvrControls" class="dvrControls">
+      </div><!--imageFeed-->
+<?php } /*end if !DefaultVideo*/ ?>
+        <p id="dvrControls">
           <input type="button" value="&lt;+" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" onclick="streamPrev( true );"/>
-          <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="inactive" disabled="disabled" onclick="streamFastRev( true );"/>
+          <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="inactive" onclick="streamFastRev( true );"/>
           <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" onclick="streamSlowRev( true );"/>
           <input type="button" value="||" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" onclick="pauseClicked();"/>
           <input type="button" value="|>" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" onclick="playClicked();"/>
           <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" onclick="streamSlowFwd( true );"/>
-          <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="inactive" disabled="disabled" onclick="streamFastFwd( true );"/>
-          <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" onclick="streamZoomOut();"/>
+          <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="inactive" onclick="streamFastFwd( true );"/>
+          <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="unavail" disabled="disabled" onclick="streamZoomOut();"/>
           <input type="button" value="+&gt;" id="nextBtn" title="<?php echo translate('Next') ?>" class="inactive" onclick="streamNext( true );"/>
         </p>
         <div id="replayStatus">
-          <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue">&nbsp;</span></span>
-          <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
-          <span id="progress"><?php echo translate('Progress') ?>: <span id="progressValue"></span>s</span>
-          <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
+          <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue">Replay</span></span>
+          <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"><?php echo $rate/100 ?></span>x</span>
+          <span id="progress"><?php echo translate('Progress') ?>: <span id="progressValue">0</span>s</span>
+          <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue">1</span>x</span>
         </div>
-      </div><!--imageFeed-->
-      </div>
-<?php } /*end if !DefaultVideo*/ ?>
-<?php
-  if ( $Event->SaveJPEGs() & 3 ) { // frames or analysis
-?>
+      </div><!--eventVideo-->
       <div id="eventStills" class="hidden">
         <div id="eventThumbsPanel">
           <div id="eventThumbs">
@@ -248,9 +239,9 @@ Warning("Streamsrc: $streamSrc");
         </div>
       </div>
 <?php
-  } // end if SaveJPEGs() & 3 Analysis or Jpegs
 } // end if Event exists
 ?>
+    </div><!--content-->
   </div><!--page-->
 </body>
 </html>
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index dc09f81cf..d2dfa1f1d 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -88,22 +88,6 @@ $maxWidth = 0;
 $maxHeight = 0;
 $archived = false;
 $unarchived = false;
-$events = array();
-foreach ( dbFetchAll( $eventsSql ) as $event_row ) {
-  $events[] = $event = new Event( $event_row );
-
-# Doesn this code do anything? 
-  $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
-  $eventWidth = reScale( $event_row['Width'], $scale );
-  $eventHeight = reScale( $event_row['Height'], $scale );
-  if ( $maxWidth < $eventWidth ) $maxWidth = $eventWidth;
-  if ( $maxHeight < $eventHeight ) $maxHeight = $eventHeight;
-  if ( $event_row['Archived'] )
-    $archived = true;
-  else
-    $unarchived = true;
-}
-
 $maxShortcuts = 5;
 $pagination = getPagination( $pages, $page, $maxShortcuts, $filterQuery.$sortQuery.'&amp;limit='.$limit );
 
@@ -160,7 +144,19 @@ if ( $pagination ) {
 $count = 0;
 $disk_space_total = 0;
 
-foreach ( $events as $event ) {
+$results = dbQuery( $eventsSql );
+while ( $event_row = dbFetchNext( $results ) ) {
+  $event = new Event( $event_row );
+  $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
+  $eventWidth = reScale( $event_row['Width'], $scale );
+  $eventHeight = reScale( $event_row['Height'], $scale );
+  if ( $maxWidth < $eventWidth ) $maxWidth = $eventWidth;
+  if ( $maxHeight < $eventHeight ) $maxHeight = $eventHeight;
+  if ( $event_row['Archived'] )
+    $archived = true;
+  else
+    $unarchived = true;
+
   if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 ) {
 ?>
             <tr>
@@ -193,12 +189,10 @@ foreach ( $events as $event ) {
   }
   $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 ?>
-            <tr>
+            <tr<?php if ($event->Archived()) echo ' class="archived"' ?>>
               <td class="colId"><?php echo makePopupLink( '?view=event&amp;eid='.$event->Id().$filterQuery.$sortQuery.'&amp;page=1', 'zmEvent', array( 'event', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), $event->Id().($event->Archived()?'*':'') ) ?></td>
               <td class="colName"><?php echo makePopupLink( '?view=event&amp;eid='.$event->Id().$filterQuery.$sortQuery.'&amp;page=1', 'zmEvent', array( 'event', reScale( $event->Width(), $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), reScale( $event->Height(), $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ) ), validHtmlStr($event->Name()).($event->Archived()?'*':'' ) ) ?></td>
-              <td class="colMonitorName"><?php echo 
-makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->Monitorid(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) )
- ?></td>
+              <td class="colMonitorName"><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->Monitorid(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
               <td class="colCause"><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?></td>
               <td class="colTime"><?php echo strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime()) ) ?></td>
               <td class="colDuration"><?php echo gmdate("H:i:s", $event->Length() ) ?></td>
@@ -293,5 +287,12 @@ if ( true || canEdit( 'Events' ) ) {
       </form>
     </div>
   </div>
+<script type="text/javascript">
+  // These are defined in the .js.php but need to be updated down here.
+  archivedEvents = <?php echo !empty($archived)?'true':'false' ?>;
+  unarchivedEvents = <?php echo !empty($unarchived)?'true':'false' ?>;
+  maxWidth = <?php echo $maxWidth?$maxWidth:0 ?>;
+  maxHeight = <?php echo $maxHeight?$maxHeight:0 ?>;
+</script>
 </body>
 </html>
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 102d4a956..95460a8f1 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -1,48 +1,43 @@
 var vid = null;
 
 function vjsReplay() {
-  vid.ready(function(){
-    var player = this;
-    player.on('ended', function() {
-      var endTime = (Date.parse(eventData.EndTime)).getTime();
-      switch(replayMode.value) {
-        case 'none':
-          break;
-        case 'single':
-          player.play();
-          break;
-        case 'all':
-          if (nextEventId == 0) {
-            let overLaid = $j("#videoobj");
-            overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;">No more events</p>');
-          } else {
-            var nextStartTime = nextEventStartTime.getTime(); //nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse
-            if (nextStartTime <= endTime) {
-             streamNext( true );
-             return;
-            }
-            let overLaid = $j("#videoobj");
-            vid.pause();
-            overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;"></p>');
-            var gapDuration = (new Date().getTime()) + (nextStartTime - endTime);
-            let messageP = $j(".vjsMessage");
-            var x = setInterval(function() {
-              var now = new Date().getTime();
-              var remainder = new Date(Math.round(gapDuration - now)).toISOString().substr(11,8);
-              messageP.html(remainder + ' to next event.');
-              if (remainder < 0) {
-                clearInterval(x);
-                streamNext( true );
-              }
-            }, 1000);
+  let endTime = (Date.parse(eventData.EndTime)).getTime();
+  switch(replayMode.value) {
+    case 'none':
+      break;
+    case 'single':
+      player.play();
+      break;
+    case 'all':
+      if (nextEventId == 0) {
+        let overLaid = $j("#videoobj");
+        overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;">No more events</p>');
+      } else {
+        let nextStartTime = nextEventStartTime.getTime(); //nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse
+        if (nextStartTime <= endTime) {
+         streamNext( true );
+         return;
+        }
+        let overLaid = $j("#videoobj");
+        vid.pause();
+        overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;"></p>');
+        let gapDuration = (new Date().getTime()) + (nextStartTime - endTime);
+        let messageP = $j(".vjsMessage");
+        let x = setInterval(function() {
+          let now = new Date().getTime();
+          let remainder = new Date(Math.round(gapDuration - now)).toISOString().substr(11,8);
+          messageP.html(remainder + ' to next event.');
+          if (remainder < 0) {
+            clearInterval(x);
+            streamNext( true );
           }
-            break;
-        case 'gapless':
-          streamNext( true );
-          break;
+        }, 1000);
       }
-    });
-  });
+        break;
+    case 'gapless':
+      streamNext( true );
+      break;
+  }
 }
 
 $j.ajaxSetup ({timeout: AJAX_TIMEOUT }); //sets timeout for all getJSON.
@@ -50,11 +45,11 @@ $j.ajaxSetup ({timeout: AJAX_TIMEOUT }); //sets timeout for all getJSON.
 var cueFrames = null; //make cueFrames availaible even if we don't send another ajax query
 
 function initialAlarmCues (eventId) {
-  $j.getJSON("api/events/"+eventId+".json", setAlarmCues); //get frames data for alarmCues and inserts into html
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=frames&id=' + eventId, setAlarmCues); //get frames data for alarmCues and inserts into html
 }
 
 function setAlarmCues (data) {
-  cueFrames = data.event.Frame;
+  cueFrames = data.frames;
   alarmSpans = renderAlarmCues();
   $j(".alarmCue").html(alarmSpans);
 }
@@ -129,7 +124,11 @@ function renderAlarmCues () {
 function setButtonState( element, butClass ) {
   if ( element ) {
     element.className = butClass;
-    element.disabled = (butClass != 'inactive');
+    if (butClass == 'unavail' || (butClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
+      element.disabled = true;
+    } else {
+      element.disabled = false;
+    }
   } else {
     console.log("Element was null in setButtonState");
   }
@@ -154,26 +153,40 @@ function scaleToFit () {
     newWidth = container.innerWidth();
     newHeight = newWidth / ratio;
   }
-  return {width: Math.floor(newWidth), height: Math.floor(newHeight)};
+  let autoScale = Math.round(newWidth / eventData.Width * SCALE_BASE);
+  let scales = $j('#scale option').map(function() {return parseInt($j(this).val());}).get();
+  scales.shift();
+  let closest = null;
+  $j(scales).each(function () { //Set zms scale to nearest regular scale.  Zoom does not like arbitrary scale values.
+    if (closest == null || Math.abs(this - autoScale) < Math.abs(closest - autoScale)) {
+      closest = this.valueOf();
+    }
+  });
+  autoScale = closest;
+  return {width: Math.floor(newWidth), height: Math.floor(newHeight), autoScale: autoScale};
 }
 
 function changeScale() {
   let scale = $j('#scale').val();
+  let newWidth = null;
+  let newHeight = null;
+  let autoScale = null;
   if (scale == "auto") {
     let newSize = scaleToFit();
-    var newWidth = newSize.width;
-    var newHeight = newSize.height;
+    newWidth = newSize.width;
+    newHeight = newSize.height;
+    autoScale = newSize.autoScale;
   } else {
     $j(window).off('resize', endOfResize); //remove resize handler when Scale to Fit is not active
-    var newWidth = eventData.Width * scale / SCALE_BASE;
-    var newHeight = eventData.Height * scale / SCALE_BASE;
+    newWidth = eventData.Width * scale / SCALE_BASE;
+    newHeight = eventData.Height * scale / SCALE_BASE;
   }
   let alarmCue = $j('div.alarmCue');
   let eventViewer = $j(vid ? '#videoobj' : '#evtStream')
   eventViewer.width(newWidth);
   eventViewer.height(newHeight);
   if ( !vid ) { // zms needs extra sizing
-    streamScale(scale == "auto" ? Math.round(newWidth / eventData.Width * SCALE_BASE) : scale);
+    streamScale(scale == "auto" ? autoScale : scale);
     alarmCue.width(newWidth);
     drawProgressBar();
   }
@@ -214,7 +227,7 @@ function getCmdResponse( respObj, respText ) {
     streamCmdTimer = clearTimeout( streamCmdTimer );
 
   streamStatus = respObj.status;
-  if (streamStatus.progress > parseFloat(eventData.Length)) streamStatus.progress = parseFloat(eventData.Length); //Limit progress to reality
+  if (streamStatus.progress >= Math.round(parseFloat(eventData.Length))) streamStatus.progress = parseFloat(eventData.Length); //Limit progress to reality
 
   var eventId = streamStatus.event;
   if ( eventId != lastEventId && lastEventId != 0) { //Doesn't run on first load, prevents a double hit on event and nearEvents ajax
@@ -224,18 +237,13 @@ function getCmdResponse( respObj, respText ) {
   }
   if (lastEventId == 0) lastEventId = eventId; //Only fires on first load.
   if ( streamStatus.paused == true ) {
-    $('modeValue').set( 'text', 'Paused' );
-    $('rate').addClass( 'hidden' );
     streamPause( );
   } else {
-    console.log('playing');
-    $('modeValue').set( 'text', "Replay" );
-    $('rateValue').set( 'text', streamStatus.rate );
-    $('rate').removeClass( 'hidden' );
+    $j('#rateValue').html(streamStatus.rate);
     streamPlay( );
   }
-  $('progressValue').set( 'text', secsToTime( parseInt(streamStatus.progress) ) );
-  $('zoomValue').set( 'text', streamStatus.zoom );
+  $j('#progressValue').html(secsToTime(parseInt(streamStatus.progress)));
+  $j('#zoomValue').html(streamStatus.zoom);
   if ( streamStatus.zoom == "1.0" )
     setButtonState( $('zoomOutBtn'), 'unavail' );
   else
@@ -255,12 +263,23 @@ function getCmdResponse( respObj, respText ) {
 
 var streamReq = new Request.JSON( { url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'chain', onSuccess: getCmdResponse } );
 
-function pauseClicked( ) {
-  streamReq.send( streamParms+"&command="+CMD_PAUSE );
+function pauseClicked() {
+  if (vid) {
+    vid.pause();
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_PAUSE );
+    streamPause();
+  }
+}
+
+function vjsPause () {
+  stopFastRev();
+  streamPause();
 }
 
-// Called when stream becomes paused, just updates the button status
 function streamPause( ) {
+  $j('#modeValue').html('Paused');
+  $j('#rateValue').html('0');
   setButtonState( $('pauseBtn'), 'active' );
   setButtonState( $('playBtn'), 'inactive' );
   setButtonState( $('fastFwdBtn'), 'unavail' );
@@ -270,13 +289,28 @@ function streamPause( ) {
 }
 
 function playClicked( ) {
-  streamReq.send( streamParms+"&command="+CMD_PLAY );
+  if (vid) {
+    if (vid.paused()) {
+      vid.play();
+    } else {
+      vjsPlay(); //handles fast forward and rewind
+    }
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_PLAY );
+    streamPlay();
+  }
+}
+
+function vjsPlay () { //catches if we change mode programatically
+  stopFastRev();
+  $j('#rateValue').html(vid.playbackRate());
+  streamPlay();
 }
 
 function streamPlay( ) {
+  $j('#modeValue').html('Replay');
   setButtonState( $('pauseBtn'), 'inactive' );
-  if (streamStatus)
-    setButtonState( $('playBtn'), streamStatus.rate==1?'active':'inactive' );
+  setButtonState( $('playBtn'), 'active' );
   setButtonState( $('fastFwdBtn'), 'inactive' );
   setButtonState( $('slowFwdBtn'), 'unavail' );
   setButtonState( $('slowRevBtn'), 'unavail' );
@@ -286,35 +320,44 @@ function streamPlay( ) {
 function streamFastFwd( action ) {
   setButtonState( $('pauseBtn'), 'inactive' );
   setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
+  setButtonState( $('fastFwdBtn'), 'active' );
   setButtonState( $('slowFwdBtn'), 'unavail' );
   setButtonState( $('slowRevBtn'), 'unavail' );
   setButtonState( $('fastRevBtn'), 'inactive' );
-  streamReq.send( streamParms+"&command="+CMD_FASTFWD );
+  if (vid) {
+    if (revSpeed != .5) stopFastRev();
+    vid.playbackRate(rates[rates.indexOf(vid.playbackRate()*100)-1]/100);
+    if (rates.indexOf(vid.playbackRate()*100)-1 == -1) setButtonState($('fastFwdBtn'), 'unavail');
+    $j('#rateValue').html(vid.playbackRate());
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_FASTFWD );
+  }
 }
 
+var spf = Math.round((eventData.Length / eventData.Frames)*1000000 )/1000000;//Seconds per frame for videojs frame by frame.
+var intervalRewind;
+var revSpeed = .5;
+
 function streamSlowFwd( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'unavail' );
-  setButtonState( $('slowFwdBtn'), 'active' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
-  setButtonState( $('fastRevBtn'), 'unavail' );
-  streamReq.send( streamParms+"&command="+CMD_SLOWFWD );
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
+  if (vid) {
+   vid.currentTime(vid.currentTime() + spf);
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_SLOWFWD );
+  }
 }
 
 function streamSlowRev( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'unavail' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'active' );
-  setButtonState( $('fastRevBtn'), 'unavail' );
-  streamReq.send( streamParms+"&command="+CMD_SLOWREV );
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
+  if (vid) {
+    vid.currentTime(vid.currentTime() - spf);
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_SLOWREV );
+  }
+}
+
+function stopFastRev () {
+  clearInterval(intervalRewind);
+  vid.playbackRate(1);
+  revSpeed = .5;
 }
 
 function streamFastRev( action ) {
@@ -323,8 +366,26 @@ function streamFastRev( action ) {
   setButtonState( $('fastFwdBtn'), 'inactive' );
   setButtonState( $('slowFwdBtn'), 'unavail' );
   setButtonState( $('slowRevBtn'), 'unavail' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
-  streamReq.send( streamParms+"&command="+CMD_FASTREV );
+  setButtonState( $('fastRevBtn'), 'active' );
+  if (vid) { //There is no reverse play with mp4.  Set the speed to 0 and manualy set the time back.
+    revSpeed = rates[rates.indexOf(revSpeed*100)-1]/100;
+    if (rates.indexOf(revSpeed*100) == 0) {
+      setButtonState( $('fastRevBtn'), 'unavail' );
+    }
+    clearInterval(intervalRewind);
+    $j('#rateValue').html(-revSpeed);
+    intervalRewind = setInterval(function() {
+      if (vid.currentTime() <= 0) {
+        clearInterval(intervalRewind);
+        vid.pause();
+      } else {
+        vid.playbackRate(0);
+        vid.currentTime(vid.currentTime() - (revSpeed/2)); //Half of reverse speed because our interval is 500ms.
+      }
+    }, 500); //500ms is a compromise between smooth reverse and realistic performance
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_FASTREV );
+  }
 }
 
 function streamPrev(action) {
@@ -337,6 +398,7 @@ function streamPrev(action) {
       location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
     } else {
       streamReq.send(streamParms+"&command="+CMD_PREV);
+      streamPlay();
     }
   }
 }
@@ -345,8 +407,8 @@ function streamNext(action) {
   if (action) {
     $j(".vjsMessage").remove();//This shouldn't happen
     if (nextEventId == 0) { //handles deleting last event.
-      vid ? vid.pause() : streamPause();
-      let hideContainer = $j( vid ? "#eventVideo" : "#imageFeed");
+      pauseClicked();
+      let hideContainer = $j('#eventVideo');
       let hideStream = $j(vid ? "#videoobj" : "#evtStream").height() + (vid ? 0 :$j("#progressBar").height());
       hideContainer.prepend('<p class="vjsMessage" style="height: ' + hideStream + 'px; line-height: ' + hideStream + 'px;">No more events</p>');
       if (vid == null) zmsBroke = true;
@@ -359,16 +421,66 @@ function streamNext(action) {
       location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery);
     } else {
       streamReq.send(streamParms+"&command="+CMD_NEXT);
+      streamPlay();
     }
   }
 }
 
+function vjsPanZoom (action, x, y) { //Pan and zoom with centering where the click occurs
+  let outer = $j('#videoobj');
+  let video = outer.children().first();
+  let zoom =  parseFloat($j('#zoomValue').html());
+  let zoomRate = .5;
+  let matrix = video.css('transform').split(',');
+  let currentPanX = parseFloat(matrix[4]);
+  let currentPanY = parseFloat(matrix[5]);
+  let xDist = outer.width()/2 - x //Click distance from center of view
+  let yDist = outer.height()/2 - y
+  if (action == 'zoomOut') {
+    zoom -= zoomRate;
+    if (x && y) {
+      x = (xDist + currentPanX)*((zoom-zoomRate)/zoom); // if ctrl-click Pan but use ratio of old zoom to new zoom for coords
+      y = (yDist + currentPanY)*((zoom-zoomRate)/zoom);
+    } else {
+      x = currentPanX*((zoom-zoomRate)/zoom); //Leave zoom centered where it was
+      y = currentPanY*((zoom-zoomRate)/zoom);
+    }
+    if (zoom <= 1) {
+      zoom = 1;
+      $j('#zoomOutBtn').attr('class', 'unavail').attr('disabled', 'disabled');
+    }
+    $j('#zoomValue').html(zoom);
+  } else if (action == 'zoom') {
+    zoom += zoomRate;
+    x = (xDist + currentPanX)*(zoom/(zoom-zoomRate)); //Pan but use ratio of new zoom to old zoom for coords.  Center on mouse click.
+    y = (yDist + currentPanY)*(zoom/(zoom-zoomRate));
+    $j('#zoomOutBtn').attr('class', 'inactive').removeAttr('disabled');
+    $j('#zoomValue').html(zoom);
+  } else if (action == 'pan') {
+    x = xDist + currentPanX;
+    y = yDist + currentPanY;
+  }
+  let limitX = ((zoom*outer.width()) - outer.width())/2; //Calculate outer bounds of video
+  let limitY = ((zoom*outer.height()) - outer.height())/2;
+  x = Math.min(Math.max((x),-limitX),limitX); //Limit pan to outer bounds of video
+  y = Math.min(Math.max((y),-limitY),limitY);
+  video.css('transform', 'matrix('+zoom+', 0, 0, '+zoom+', '+x+', '+y+')');
+}
+
 function streamZoomIn( x, y ) {
-  streamReq.send( streamParms+"&command="+CMD_ZOOMIN+"&x="+x+"&y="+y );
+  if (vid) {
+    vjsPanZoom('zoom', x, y);
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_ZOOMIN+"&x="+x+"&y="+y );
+  }
 }
 
 function streamZoomOut() {
-  streamReq.send( streamParms+"&command="+CMD_ZOOMOUT );
+  if (vid) {
+    vjsPanZoom('zoomOut');
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_ZOOMOUT );
+  }
 }
 
 function streamScale( scale ) {
@@ -376,7 +488,11 @@ function streamScale( scale ) {
 }
 
 function streamPan( x, y ) {
-  streamReq.send( streamParms+"&command="+CMD_PAN+"&x="+x+"&y="+y );
+  if (vid) {
+    vjsPanZoom('pan', x, y);
+  } else {
+    streamReq.send( streamParms+"&command="+CMD_PAN+"&x="+x+"&y="+y );
+  }
 }
 
 function streamSeek( offset ) {
@@ -434,6 +550,10 @@ function getEventResponse( respObj, respText ) {
     initialAlarmCues(eventData.Id);//ajax and render, new event
     addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime);
     CurEventDefVideoPath = null;
+    $j('#modeValue').html('Replay');
+    $j('#zoomValue').html('1');
+    $j('#rateValue').html('1');
+    vjsPanZoom('zoomOut');
   } else {
     drawProgressBar();
   }
@@ -487,7 +607,7 @@ function loadEventThumb( event, frame, loadImage ) {
     console.error( "No holder found for frame "+frame.FrameId );
     return;
   }
-  var img = new Asset.image( imagePrefix+frame.Image.imagePath,
+  var img = new Asset.image( imagePrefix+frame.EventId+"&fid="+frame.FrameId,
       {
       'onload': ( function( loadImage ) {
           thumbImg.setProperty( 'src', img.getProperty( 'src' ) );
@@ -503,29 +623,6 @@ function loadEventThumb( event, frame, loadImage ) {
       );
 }
 
-function updateStillsSizes( noDelay ) {
-  var containerDim = $('eventThumbs').getSize();
-
-  var containerWidth = containerDim.x;
-  var containerHeight = containerDim.y;
-  var popupWidth = parseInt($('eventImage').getStyle( 'width' ));
-  var popupHeight = parseInt($('eventImage').getStyle( 'height' ));
-
-  var left = (containerWidth - popupWidth)/2;
-  if ( left < 0 ) left = 0;
-  var top = (containerHeight - popupHeight)/2;
-  if ( top < 0 ) top = 0;
-  if ( popupHeight == 0 && !noDelay ) {
-    // image not yet loaded lets give it another second
-    updateStillsSizes.pass( true ).delay( 50 );
-    return;
-  }
-  $('eventImagePanel').setStyles( {
-      'left': left,
-      'top': top
-      } );
-}
-
 function loadEventImage( event, frame ) {
   console.debug( "Loading "+event.Id+"/"+frame.FrameId );
   var eventImg = $('eventImage');
@@ -539,14 +636,6 @@ function loadEventImage( event, frame ) {
       lastThumbImg.setOpacity( 1.0 );
     }
 
-    eventImg.setProperties( {
-        'class': frame.Type=='Alarm'?'alarm':'normal',
-        'src': thumbImg.getProperty( 'src' ),
-        'title': thumbImg.getProperty( 'title' ),
-        'alt': thumbImg.getProperty( 'alt' ),
-        'width': event.Width,
-        'height': event.Height
-        } );
     $('eventImageBar').setStyle( 'width', event.Width );
     if ( frame.Type=='Alarm' )
       $('eventImageStats').removeClass( 'hidden' );
@@ -557,11 +646,18 @@ function loadEventImage( event, frame ) {
 
     if ( eventImagePanel.getStyle( 'display' ) == 'none' ) {
       eventImagePanel.setOpacity( 0 );
-      updateStillsSizes();
-      eventImagePanel.setStyle( 'display', 'block' );
+      eventImagePanel.setStyle( 'display', 'inline-block' );
       new Fx.Tween( eventImagePanel, { duration: 500, transition: Fx.Transitions.Sine } ).start( 'opacity', 0, 1 );
     }
 
+    eventImg.setProperties( {
+        'class': frame.Type=='Alarm'?'alarm':'normal',
+        'src': thumbImg.getProperty( 'src' ),
+        'title': thumbImg.getProperty( 'title' ),
+        'alt': thumbImg.getProperty( 'alt' ),
+        'height': $j('#eventThumbs').height() - $j('#eventImageBar').outerHeight(true)-10
+        } );
+
     $('eventImageNo').set( 'text', frame.FrameId );
     $('prevImageBtn').disabled = (frame.FrameId==1);
     $('nextImageBtn').disabled = (frame.FrameId==event.Frames);
@@ -608,7 +704,7 @@ function resetEventStills() {
     } ).set( 0 );
   }
   if ( $('eventThumbs').getStyle( 'height' ).match( /^\d+/ ) < (parseInt(eventData.Height)+80) )
-    $('eventThumbs').setStyle( 'height', (parseInt(eventData.Height)+80)+'px' );
+    $('eventThumbs').setStyle( 'height', ($j(vid ? '#videoobj' : '#evtStream').height())+'px' );
 }
 
 function getFrameResponse( respObj, respText ) {
@@ -759,6 +855,7 @@ function actQuery( action, parms ) {
 }
 
 function deleteEvent() {
+  pauseClicked(); //Provides visual feedback that your click happened.
   actQuery( 'delete' );
   streamNext( true );
 }
@@ -788,21 +885,19 @@ function showEventFrames() {
   createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames' );
 }
 
-function showVideo() {
+function showStream() {
   $('eventStills').addClass( 'hidden' );
-  $('imageFeed').addClass('hidden');
   $('eventVideo').removeClass( 'hidden' );
 
   $('stillsEvent').removeClass( 'hidden' );
-  $('videoEvent').addClass( 'hidden' );
+  $('streamEvent').addClass( 'hidden' );
 
   streamMode = 'video';
 }
 
 function showStills() {
   $('eventStills').removeClass( 'hidden' );
-  $('imageFeed').removeClass('hidden');
-  $('eventVideo').addClass( 'hidden' );		
+  $('eventVideo').addClass( 'hidden' );
 
   if (vid && ( vid.paused != true ) ) {
     // Pause the video
@@ -814,11 +909,11 @@ function showStills() {
   }
 
   $('stillsEvent').addClass( 'hidden' );
-  $('videoEvent').removeClass( 'hidden' );
+  $('streamEvent').removeClass( 'hidden' );
 
   streamMode = 'stills';
 
-  streamPause( true );
+  pauseClicked();
   if ( !scroll ) {
     scroll = new Fx.Scroll( 'eventThumbs', {
       wait: false,
@@ -829,7 +924,6 @@ function showStills() {
     );
   }
   resetEventStills();
-  $(window).addEvent( 'resize', updateStillsSizes );
 }
 
 function showFrameStats() {
@@ -867,145 +961,38 @@ function progressBarNav (){
 
 function handleClick( event ) {
   var target = event.target;
-  var x = event.page.x - $(target).getLeft();
-  var y = event.page.y - $(target).getTop();
+  if (vid) {
+    if (target.id != 'videoobj') return; //ignore clicks on control bar
+    var x = event.offsetX;
+    var y = event.offsetY;
+  } else {
+    var x = event.page.x - $(target).getLeft();
+    var y = event.page.y - $(target).getTop();
+  }
 
-  if (event.shift) {
+  if (event.shift || event.shiftKey) {//handle both jquery and mootools
     streamPan(x, y);
+  } else if (vid && event.ctrlKey) { //allow zoom out by control click.  useful in fullscreen
+    vjsPanZoom('zoomOut', x, y);
   } else {
     streamZoomIn(x, y);
   }
 }
 
-function setupListener() {
-
-  // Buttons
-  var playButton = document.getElementById("play-pause");
-  var muteButton = document.getElementById("mute");
-  var fullScreenButton = document.getElementById("full-screen");
-
-  // Sliders
-  var seekBar = document.getElementById("seekbar");
-  var volumeBar = document.getElementById("volume-bar");
-
-  // Event listener for the play/pause button
-  playButton.addEventListener( "click", function() {
-      if (vid.paused == true) {
-      // Play the video
-      vid.play();
-
-      // Update the button text to 'Pause'
-      playButton.innerHTML = "Pause";
-      } else {
-      // Pause the video
-      vid.pause();
-
-      // Update the button text to 'Play'
-      playButton.innerHTML = "Play";
-      }
-      });
-
-
-  // Event listener for the mute button
-  muteButton.addEventListener("click", function() {
-      if (vid.muted == false) {
-      // Mute the video
-      vid.muted = true;
-
-      // Update the button text
-      muteButton.innerHTML = "Unmute";
-      } else {
-      // Unmute the video
-      vid.muted = false;
-
-      // Update the button text
-      muteButton.innerHTML = "Mute";
-      }
-      });
-
-
-  // Event listener for the full-screen button
-  fullScreenButton.addEventListener("click", function() {
-      if (vid.requestFullscreen) {
-      vid.requestFullscreen();
-      } else if (vid.mozRequestFullScreen) {
-      vid.mozRequestFullScreen(); // Firefox
-      } else if (vid.webkitRequestFullscreen) {
-      vid.webkitRequestFullscreen(); // Chrome and Safari
-      }
-      });
-
-
-  // Event listener for the seek bar
-  seekBar.addEventListener("change", function() {
-      // Calculate the new time
-      var time = vid.duration * (seekBar.value / 100);
-
-      // Update the video time
-      vid.currentTime = time;
-      });
-
-
-  // Update the seek bar as the video plays
-  vid.addEventListener("timeupdate", function() {
-      // Calculate the slider value
-      var value = (100 / vid.duration) * vid.currentTime;
-
-      // Update the slider value
-      seekBar.value = value;
-      });
-
-  // Pause the video when the seek handle is being dragged
-  seekBar.addEventListener("mousedown", function() {
-      vid.pause();
-      });
-
-  // Play the video when the seek handle is dropped
-  seekBar.addEventListener("mouseup", function() {
-      vid.play();
-      });
-
-  // Event listener for the volume bar
-  volumeBar.addEventListener("change", function() {
-      // Update the video volume
-      vid.volume = volumeBar.value;
-      });
-}
-
 function initPage() {
   //FIXME prevent blocking...not sure what is happening or best way to unblock
   if ($j('#videoobj').length) {
-    vid = videojs("videoobj");
+    vid = videojs('videoobj');
     addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime);
-    $j(".vjs-progress-control").append('<div class="alarmCue"></div>');//add a place for videojs only on first load
-    nearEventsQuery(eventData.Id);
-    initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues after videojs is initialized
-    vjsReplay();
-  }
-  if (vid) {
-/*
-    setupListener();
-      vid.removeAttribute("controls");
-    /* window.videoobj.oncanplay=null;
-    window.videoobj.currentTime=window.videoobj.currentTime-1;
-    window.videoobj.currentTime=window.videoobj.currentTime+1;//may not be symetrical of course
-
-    vid.onstalled=function(){window.vid.currentTime=window.vid.currentTime-1;window.vid.currentTime=window.vid.currentTime+1;} 
-    vid.onwaiting=function(){window.vid.currentTime=window.vid.currentTime-1;window.vid.currentTime=window.vid.currentTime+1;}
-    vid.onloadstart=function(){window.vid.currentTime=window.vid.currentTime-1;window.vid.currentTime=window.vid.currentTime+1;}
-    vid.onplay=function(){window.vid.currentTime=window.vid.currentTime-1;window.vid.currentTime=window.vid.currentTime+1;}
-    vid.onplaying=function(){window.vid.currentTime=window.vid.currentTime-1;window.vid.currentTime=window.vid.currentTime+1;}
-    //window.vid.hide();//does not help
-    var sources = window.videoobj.getElementsByTagName('source');
-    sources[0].src=null;
-    window.videoobj.load();
-    streamPlay();    */
+    $j('.vjs-progress-control').append('<div class="alarmCue"></div>');//add a place for videojs only on first load
+    vid.on('ended', vjsReplay);
+    vid.on('play', vjsPlay);
+    vid.on('pause', vjsPause);
+    vid.on('click', function(event){handleClick(event);});
+    vid.on('timeupdate', function (){$j('#progressValue').html(secsToTime(Math.floor(vid.currentTime())))});
   } else {
     progressBarNav ();
     streamCmdTimer = streamQuery.delay( 250 );
-    eventQuery.pass( eventData.Id ).delay( 500 );
-    initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues for zms.
-
     if ( canStreamNative ) {
       var streamImg = $('imageFeed').getElement('img');
       if ( !streamImg )
@@ -1013,7 +1000,9 @@ function initPage() {
       $(streamImg).addEvent( 'click', function( event ) { handleClick( event ); } );
     }
   }
-if (scale == "auto") changeScale();
+  nearEventsQuery(eventData.Id);
+  initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues
+  if (scale == "auto") changeScale();
 }
 
 // Kick everything off
diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index 5a3e083de..4187b4be1 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -33,12 +33,14 @@ var eventData = {
     Length: '<?php echo $Event->Length() ?>',
     StartTime: '<?php echo $Event->StartTime() ?>',
     EndTime: '<?php echo $Event->EndTime() ?>',
+    Frames: '<?php echo $Event->Frames() ?>',
     MonitorName: '<?php echo $Monitor->Name() ?>'
 };
 
 var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
 var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';
 
+var rates = <?php echo json_encode(array_keys($rates)) ?>;
 var scale = "<?php echo $scale ?>";
 var LabelFormat = "<?php echo validJsStr($Monitor->LabelFormat())?>";
 
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 364e79b91..a9aef7b5b 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -1,4 +1,4 @@
-var requestQueue = new Request.Queue( { concurrent: 2 } );
+var requestQueue = new Request.Queue( { concurrent: monitorData.length, stopOnFailure: false } );
 
 function Monitor( monitorData ) {
   this.id = monitorData.id;
@@ -7,15 +7,18 @@ function Monitor( monitorData ) {
   this.status = null;
   this.alarmState = STATE_IDLE;
   this.lastAlarmState = STATE_IDLE;
-  this.streamCmdParms = 'view=request&request=stream&connkey='+this.connKey;
+  this.streamCmdParms = this.server_url+'?view=request&request=stream&connkey='+this.connKey;
   this.onclick = monitorData.onclick;
   if ( auth_hash )
     this.streamCmdParms += '&auth='+auth_hash;
   this.streamCmdTimer = null;
 
-  this.start = function( delay ) {
+  /*
+  this.zm_startup = function( delay ) {
+    console.log("Starting streamwatch for " + this.connKey );
     this.streamCmdTimer = this.streamCmdQuery.delay( delay, this );
   };
+  */
 
   this.setStateClass = function( element, stateClass ) {
     if ( !element.hasClass( stateClass ) ) {
@@ -29,6 +32,30 @@ function Monitor( monitorData ) {
     }
   };
 
+  this.onError = function( text, error ) {
+    console.log('onerror: ' + text + ' error:'+error);
+    // Requeue, but want to wait a while.
+    var streamCmdTimeout = 1000*statusRefreshTimeout;
+    this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this );
+  };
+  this.onFailure = function( xhr ) {
+    console.log('onFailure: ' + this.connKey);
+    console.log(xhr );
+    if ( ! requestQueue.hasNext("cmdReq"+this.id) ) { 
+      console.log("Not requeuing because there is one already");
+      requestQueue.addRequest( "cmdReq"+this.id, this.streamCmdReq );
+    }
+    if ( 0 ) {
+    // Requeue, but want to wait a while.
+    if ( this.streamCmdTimer )
+      this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
+    var streamCmdTimeout = 1000*statusRefreshTimeout;
+    this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this, true );
+    requestQueue.resume();
+    }
+      console.log("done failure");
+  };
+
   this.getStreamCmdResponse = function( respObj, respText ) {
     if ( this.streamCmdTimer )
       this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
@@ -91,8 +118,11 @@ function Monitor( monitorData ) {
       console.error( respObj.message );
       // Try to reload the image stream.
       if ( stream ) {
+        if ( stream.src ) {
         console.log('Reloading stream: ' + stream.src );
         stream.src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
+        } else {
+        }
       } else {
         console.log( 'No stream to reload?' );
       }
@@ -107,18 +137,13 @@ function Monitor( monitorData ) {
   };
 
   this.streamCmdQuery = function( resent ) {
-    if ( resent )
-    console.log( this.connKey+": Resending" );
-    //this.streamCmdReq.cancel();
+    if ( resent ) {
+      console.log( this.connKey+": Resending" );
+      this.streamCmdReq.cancel();
+    }
+    console.log("Starting CmdQuery for " + this.connKey );
     this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY );
   };
-  this.onError = function( text, error ) {
-    console.log('onerror: ' + text + ' error:'+error);
-  };
-  this.onFailure = function( xhr ) {
-    console.log('onFailure: ' );
-    console.log(xhr );
-  };
 
   this.streamCmdReq = new Request.JSON( {
     url: this.server_url,
@@ -131,6 +156,7 @@ function Monitor( monitorData ) {
     link: 'cancel'
   } );
 
+  console.log("queueing for " + this.id + " " + this.connKey );
   requestQueue.addRequest( "cmdReq"+this.id, this.streamCmdReq );
 }
 
@@ -187,10 +213,11 @@ function selectLayout( element ) {
       if ( streamImg ) {
         if ( streamImg.nodeName == 'IMG' ) {
           var src = streamImg.src;
-          streamImg.src='';
           src = src.replace(/width=[\.\d]+/i,'width=0' );
-          src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
-          streamImg.src = src;
+          if ( src != streamImg.src ) {
+            streamImg.src='';
+            streamImg.src = src;
+          }
         } else if ( streamImg.nodeName == 'APPLET' || streamImg.nodeName == 'OBJECT' ) {
           // APPLET's and OBJECTS need to be re-initialized
         }
@@ -246,6 +273,7 @@ function changeSize() {
   Cookie.write( 'zmMontageScale', '', { duration: 10*365 } );
   Cookie.write( 'zmMontageWidth', width, { duration: 10*365 } );
   Cookie.write( 'zmMontageHeight', height, { duration: 10*365 } );
+  selectLayout('#zmMontageLayout');
 } // end function changeSize()
 
 function changeScale() {
@@ -356,12 +384,18 @@ function cancel_layout(button) {
 
 var monitors = new Array();
 function initPage() {
+console.log("initPage");
   for ( var i = 0; i < monitorData.length; i++ ) {
     monitors[i] = new Monitor(monitorData[i]);
-    var delay = Math.round( (Math.random()+0.75)*statusRefreshTimeout );
-    monitors[i].start(delay);
   }
   selectLayout('#zmMontageLayout');
+
+  for ( var i = 0; i < monitorData.length; i++ ) {
+    var delay = Math.round( (Math.random()+0.75)*statusRefreshTimeout );
+    console.log("Delay for monitor " + monitorData[i].id + " is " + delay );
+    monitors[i].streamCmdQuery.delay( delay, monitors[i] );
+    //monitors[i].zm_startup(delay);
+  }
 }
 // Kick everything off
 window.addEvent( 'domready', initPage );
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index b29886b1e..7202a430d 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -823,14 +823,14 @@ switch ( $tab ) {
             <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
             <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $monitor->V4LMultiBuffer() == 0 ? 'checked="checked"' : '' ) ?>/>
             <label for="newMonitor[V4LMultiBuffer]0">No</label>
-            <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($monitor->V4LMultiBuffer()) ? 'checked="checked"' : '' ) ?>/>
+            <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( $monitor->V4LMultiBuffer() ? 'checked="checked"' : '' ) ?>/>
             <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
           </td></tr>
           <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $monitor->V4LCapturesPerFrame()?>"/></td></tr>
 <?php
       
       } else if ( $monitor->Type() == 'NVSocket' ) {
-include("_monitor_source_nvsocket.php");
+include('_monitor_source_nvsocket.php');
       } else if ( $monitor->Type() == 'Remote' ) {
 ?>
           <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo htmlSelect( "newMonitor[Protocol]", $remoteProtocols, $monitor->Protocol(), "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 889057f93..1c1d56cea 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -65,6 +65,7 @@ if ( $tab == 'skins' ) {
   $current_css = $_COOKIE['zmCSS'];
   if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) {
     setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 );
+    array_map('unlink', glob(ZM_PATH_WEB.'/cache/*')); //cleanup symlinks from cache_bust
     //header("Location: index.php?view=options&tab=skins&reset_parent=1");
     $reload = true;
   }
diff --git a/web/tools/mootools/mootools-core-1.4.5-compat.js b/web/tools/mootools/mootools-core-1.4.5-compat.js
index 574c9411a..793c388c4 100644
--- a/web/tools/mootools/mootools-core-1.4.5-compat.js
+++ b/web/tools/mootools/mootools-core-1.4.5-compat.js
@@ -1,16 +1,7 @@
-/*
----
-MooTools: the javascript framework
-
-web build:
- - http://mootools.net/core/76bf47062d6c1983d66ce47ad66aa0e0
-
-packager build:
- - packager build Core/Core Core/Array Core/String Core/Number Core/Function Core/Object Core/Event Core/Browser Core/Class Core/Class.Extras Core/Slick.Parser Core/Slick.Finder Core/Element Core/Element.Style Core/Element.Event Core/Element.Delegation Core/Element.Dimensions Core/Fx Core/Fx.CSS Core/Fx.Tween Core/Fx.Morph Core/Fx.Transitions Core/Request Core/Request.HTML Core/Request.JSON Core/Cookie Core/JSON Core/DOMReady Core/Swiff
-
-...
+/* MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2017 [Valerio Proietti](https://mootools.net/).*/ 
+/*!
+Web Build: https://mootools.net/core/builder/e426a9ae7167c5807b173d5deff673fc
 */
-
 /*
 ---
 
@@ -20,7 +11,7 @@ description: The heart of MooTools.
 
 license: MIT-style license.
 
-copyright: Copyright (c) 2006-2012 [Valerio Proietti](http://mad4milk.net/).
+copyright: Copyright (c) 2006-2015 [Valerio Proietti](https://github.com/kamicane/).
 
 authors: The MooTools production team (http://mootools.net/developers/)
 
@@ -32,12 +23,12 @@ provides: [Core, MooTools, Type, typeOf, instanceOf, Native]
 
 ...
 */
-
+/*! MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2015 [Valerio Proietti](https://github.com/kamicane/).*/
 (function(){
 
 this.MooTools = {
-	version: '1.4.5',
-	build: 'ab8ea8824dc3b24b6666867a2c4ed58ebb762cf0'
+	version: '1.6.0',
+	build: '529422872adfff401b901b8b6c7ca5114ee95e2b'
 };
 
 // typeOf, instanceOf
@@ -50,7 +41,7 @@ var typeOf = this.typeOf = function(item){
 		if (item.nodeType == 1) return 'element';
 		if (item.nodeType == 3) return (/\S/).test(item.nodeValue) ? 'textnode' : 'whitespace';
 	} else if (typeof item.length == 'number'){
-		if (item.callee) return 'arguments';
+		if ('callee' in item) return 'arguments';
 		if ('item' in item) return 'collection';
 	}
 
@@ -70,13 +61,25 @@ var instanceOf = this.instanceOf = function(item, object){
 	return item instanceof object;
 };
 
-// Function overloading
-
-var Function = this.Function;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 
+/*<ltIE8>*/
 var enumerables = true;
 for (var i in {toString: 1}) enumerables = null;
 if (enumerables) enumerables = ['hasOwnProperty', 'valueOf', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'constructor'];
+function forEachObjectEnumberableKey(object, fn, bind){
+	if (enumerables) for (var i = enumerables.length; i--;){
+		var k = enumerables[i];
+		// signature has key-value, so overloadSetter can directly pass the
+		// method function, without swapping arguments.
+		if (hasOwnProperty.call(object, k)) fn.call(bind, k, object[k]);
+	}
+}
+/*</ltIE8>*/
+
+// Function overloading
+
+var Function = this.Function;
 
 Function.prototype.overloadSetter = function(usePlural){
 	var self = this;
@@ -84,10 +87,9 @@ Function.prototype.overloadSetter = function(usePlural){
 		if (a == null) return this;
 		if (usePlural || typeof a != 'string'){
 			for (var k in a) self.call(this, k, a[k]);
-			if (enumerables) for (var i = enumerables.length; i--;){
-				k = enumerables[i];
-				if (a.hasOwnProperty(k)) self.call(this, k, a[k]);
-			}
+			/*<ltIE8>*/
+			forEachObjectEnumberableKey(a, self, this);
+			/*</ltIE8>*/
 		} else {
 			self.call(this, a, b);
 		}
@@ -124,26 +126,33 @@ Function.prototype.implement = function(key, value){
 
 var slice = Array.prototype.slice;
 
-Function.from = function(item){
+Array.convert = function(item){
+	if (item == null) return [];
+	return (Type.isEnumerable(item) && typeof item != 'string') ? (typeOf(item) == 'array') ? item : slice.call(item) : [item];
+};
+
+Function.convert = function(item){
 	return (typeOf(item) == 'function') ? item : function(){
 		return item;
 	};
 };
 
-Array.from = function(item){
-	if (item == null) return [];
-	return (Type.isEnumerable(item) && typeof item != 'string') ? (typeOf(item) == 'array') ? item : slice.call(item) : [item];
-};
 
-Number.from = function(item){
+Number.convert = function(item){
 	var number = parseFloat(item);
 	return isFinite(number) ? number : null;
 };
 
-String.from = function(item){
+String.convert = function(item){
 	return item + '';
 };
 
+
+
+Function.from = Function.convert;
+Number.from = Number.convert;
+String.from = String.convert;
+
 // hide, protect
 
 Function.implement({
@@ -174,9 +183,7 @@ var Type = this.Type = function(name, object){
 			object.prototype.$family = (function(){
 				return lower;
 			}).hide();
-			//<1.2compat>
-			object.type = typeCheck;
-			//</1.2compat>
+			
 		}
 	}
 
@@ -269,7 +276,7 @@ var force = function(name, object, methods){
 			if (!methodsEnumerable) for (var i = 0, l = methods.length; i < l; i++){
 				fn.call(prototype, prototype[methods[i]], methods[i]);
 			}
-			for (var key in prototype) fn.call(prototype, prototype[key], key)
+			for (var key in prototype) fn.call(prototype, prototype[key], key);
 		};
 	}
 
@@ -277,11 +284,11 @@ var force = function(name, object, methods){
 };
 
 force('String', String, [
-	'charAt', 'charCodeAt', 'concat', 'indexOf', 'lastIndexOf', 'match', 'quote', 'replace', 'search',
+	'charAt', 'charCodeAt', 'concat', 'contains', 'indexOf', 'lastIndexOf', 'match', 'quote', 'replace', 'search',
 	'slice', 'split', 'substr', 'substring', 'trim', 'toLowerCase', 'toUpperCase'
 ])('Array', Array, [
 	'pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice',
-	'indexOf', 'lastIndexOf', 'filter', 'forEach', 'every', 'map', 'some', 'reduce', 'reduceRight'
+	'indexOf', 'lastIndexOf', 'filter', 'forEach', 'every', 'map', 'some', 'reduce', 'reduceRight', 'contains'
 ])('Number', Number, [
 	'toExponential', 'toFixed', 'toLocaleString', 'toPrecision'
 ])('Function', Function, [
@@ -314,24 +321,17 @@ Number.extend('random', function(min, max){
 	return Math.floor(Math.random() * (max - min + 1) + min);
 });
 
-// forEach, each
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-Object.extend('forEach', function(object, fn, bind){
-	for (var key in object){
-		if (hasOwnProperty.call(object, key)) fn.call(bind, object[key], key, object);
-	}
-});
-
-Object.each = Object.forEach;
+// forEach, each, keys
 
 Array.implement({
 
+	/*<!ES5>*/
 	forEach: function(fn, bind){
 		for (var i = 0, l = this.length; i < l; i++){
 			if (i in this) fn.call(bind, this[i], i, this);
 		}
 	},
+	/*</!ES5>*/
 
 	each: function(fn, bind){
 		Array.forEach(this, fn, bind);
@@ -340,6 +340,32 @@ Array.implement({
 
 });
 
+Object.extend({
+
+	keys: function(object){
+		var keys = [];
+		for (var k in object){
+			if (hasOwnProperty.call(object, k)) keys.push(k);
+		}
+		/*<ltIE8>*/
+		forEachObjectEnumberableKey(object, function(k){
+			keys.push(k);
+		});
+		/*</ltIE8>*/
+		return keys;
+	},
+
+	forEach: function(object, fn, bind){
+		Object.keys(object).forEach(function(key){
+			fn.call(bind, object[key], key, object);
+		});
+	}
+
+});
+
+Object.each = Object.forEach;
+
+
 // Array & Object cloning, Object merging and appending
 
 var cloneOf = function(item){
@@ -361,7 +387,7 @@ var mergeOne = function(source, key, current){
 		case 'object':
 			if (typeOf(source[key]) == 'object') Object.merge(source[key], current);
 			else source[key] = Object.clone(current);
-		break;
+			break;
 		case 'array': source[key] = current.clone(); break;
 		default: source[key] = current;
 	}
@@ -409,129 +435,10 @@ String.extend('uniqueID', function(){
 	return (UID++).toString(36);
 });
 
-//<1.2compat>
 
-var Hash = this.Hash = new Type('Hash', function(object){
-	if (typeOf(object) == 'hash') object = Object.clone(object.getClean());
-	for (var key in object) this[key] = object[key];
-	return this;
-});
-
-Hash.implement({
-
-	forEach: function(fn, bind){
-		Object.forEach(this, fn, bind);
-	},
-
-	getClean: function(){
-		var clean = {};
-		for (var key in this){
-			if (this.hasOwnProperty(key)) clean[key] = this[key];
-		}
-		return clean;
-	},
-
-	getLength: function(){
-		var length = 0;
-		for (var key in this){
-			if (this.hasOwnProperty(key)) length++;
-		}
-		return length;
-	}
-
-});
-
-Hash.alias('each', 'forEach');
-
-Object.type = Type.isObject;
-
-var Native = this.Native = function(properties){
-	return new Type(properties.name, properties.initialize);
-};
-
-Native.type = Type.type;
-
-Native.implement = function(objects, methods){
-	for (var i = 0; i < objects.length; i++) objects[i].implement(methods);
-	return Native;
-};
-
-var arrayType = Array.type;
-Array.type = function(item){
-	return instanceOf(item, Array) || arrayType(item);
-};
-
-this.$A = function(item){
-	return Array.from(item).slice();
-};
-
-this.$arguments = function(i){
-	return function(){
-		return arguments[i];
-	};
-};
-
-this.$chk = function(obj){
-	return !!(obj || obj === 0);
-};
-
-this.$clear = function(timer){
-	clearTimeout(timer);
-	clearInterval(timer);
-	return null;
-};
-
-this.$defined = function(obj){
-	return (obj != null);
-};
-
-this.$each = function(iterable, fn, bind){
-	var type = typeOf(iterable);
-	((type == 'arguments' || type == 'collection' || type == 'array' || type == 'elements') ? Array : Object).each(iterable, fn, bind);
-};
-
-this.$empty = function(){};
-
-this.$extend = function(original, extended){
-	return Object.append(original, extended);
-};
-
-this.$H = function(object){
-	return new Hash(object);
-};
-
-this.$merge = function(){
-	var args = Array.slice(arguments);
-	args.unshift({});
-	return Object.merge.apply(null, args);
-};
-
-this.$lambda = Function.from;
-this.$mixin = Object.merge;
-this.$random = Number.random;
-this.$splat = Array.from;
-this.$time = Date.now;
-
-this.$type = function(object){
-	var type = typeOf(object);
-	if (type == 'elements') return 'array';
-	return (type == 'null') ? false : type;
-};
-
-this.$unlink = function(object){
-	switch (typeOf(object)){
-		case 'object': return Object.clone(object);
-		case 'array': return Array.clone(object);
-		case 'hash': return new Hash(object);
-		default: return object;
-	}
-};
-
-//</1.2compat>
 
 })();
 
-
 /*
 ---
 
@@ -541,7 +448,7 @@ description: Contains Array Prototypes like each, contains, and erase.
 
 license: MIT-style license.
 
-requires: Type
+requires: [Type]
 
 provides: Array
 
@@ -684,7 +591,7 @@ Array.implement({
 		if (this.length != 3) return null;
 		var rgb = this.map(function(value){
 			if (value.length == 1) value += value;
-			return value.toInt(16);
+			return parseInt(value, 16);
 		});
 		return (array) ? rgb : 'rgb(' + rgb + ')';
 	},
@@ -702,16 +609,144 @@ Array.implement({
 
 });
 
-//<1.2compat>
 
-Array.alias('extend', 'append');
 
-var $pick = function(){
-	return Array.from(arguments).pick();
-};
+/*
+---
 
-//</1.2compat>
+name: Function
 
+description: Contains Function Prototypes like create, bind, pass, and delay.
+
+license: MIT-style license.
+
+requires: Type
+
+provides: Function
+
+...
+*/
+
+Function.extend({
+
+	attempt: function(){
+		for (var i = 0, l = arguments.length; i < l; i++){
+			try {
+				return arguments[i]();
+			} catch (e){}
+		}
+		return null;
+	}
+
+});
+
+Function.implement({
+
+	attempt: function(args, bind){
+		try {
+			return this.apply(bind, Array.convert(args));
+		} catch (e){}
+
+		return null;
+	},
+
+	/*<!ES5-bind>*/
+	bind: function(that){
+		var self = this,
+			args = arguments.length > 1 ? Array.slice(arguments, 1) : null,
+			F = function(){};
+
+		var bound = function(){
+			var context = that, length = arguments.length;
+			if (this instanceof bound){
+				F.prototype = self.prototype;
+				context = new F;
+			}
+			var result = (!args && !length)
+				? self.call(context)
+				: self.apply(context, args && length ? args.concat(Array.slice(arguments)) : args || arguments);
+			return context == that ? result : context;
+		};
+		return bound;
+	},
+	/*</!ES5-bind>*/
+
+	pass: function(args, bind){
+		var self = this;
+		if (args != null) args = Array.convert(args);
+		return function(){
+			return self.apply(bind, args || arguments);
+		};
+	},
+
+	delay: function(delay, bind, args){
+		return setTimeout(this.pass((args == null ? [] : args), bind), delay);
+	},
+
+	periodical: function(periodical, bind, args){
+		return setInterval(this.pass((args == null ? [] : args), bind), periodical);
+	}
+
+});
+
+
+
+/*
+---
+
+name: Number
+
+description: Contains Number Prototypes like limit, round, times, and ceil.
+
+license: MIT-style license.
+
+requires: Type
+
+provides: Number
+
+...
+*/
+
+Number.implement({
+
+	limit: function(min, max){
+		return Math.min(max, Math.max(min, this));
+	},
+
+	round: function(precision){
+		precision = Math.pow(10, precision || 0).toFixed(precision < 0 ? -precision : 0);
+		return Math.round(this * precision) / precision;
+	},
+
+	times: function(fn, bind){
+		for (var i = 0; i < this; i++) fn.call(bind, i, this);
+	},
+
+	toFloat: function(){
+		return parseFloat(this);
+	},
+
+	toInt: function(base){
+		return parseInt(this, base || 10);
+	}
+
+});
+
+Number.alias('each', 'times');
+
+(function(math){
+
+var methods = {};
+
+math.each(function(name){
+	if (!Number[name]) methods[name] = function(){
+		return Math[name].apply(null, [this].concat(Array.convert(arguments)));
+	};
+});
+
+Number.implement(methods);
+
+})(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']);
 
 /*
 ---
@@ -722,7 +757,7 @@ description: Contains String Prototypes like camelCase, capitalize, test, and to
 
 license: MIT-style license.
 
-requires: Type
+requires: [Type, Array]
 
 provides: String
 
@@ -731,14 +766,16 @@ provides: String
 
 String.implement({
 
+	//<!ES6>
+	contains: function(string, index){
+		return (index ? String(this).slice(index) : String(this)).indexOf(string) > -1;
+	},
+	//</!ES6>
+
 	test: function(regex, params){
 		return ((typeOf(regex) == 'regexp') ? regex : new RegExp('' + regex, params)).test(this);
 	},
 
-	contains: function(string, separator){
-		return (separator) ? (separator + this + separator).indexOf(separator + string + separator) > -1 : String(this).indexOf(string) > -1;
-	},
-
 	trim: function(){
 		return String(this).replace(/^\s+|\s+$/g, '');
 	},
@@ -797,400 +834,6 @@ String.implement({
 });
 
 
-/*
----
-
-name: Number
-
-description: Contains Number Prototypes like limit, round, times, and ceil.
-
-license: MIT-style license.
-
-requires: Type
-
-provides: Number
-
-...
-*/
-
-Number.implement({
-
-	limit: function(min, max){
-		return Math.min(max, Math.max(min, this));
-	},
-
-	round: function(precision){
-		precision = Math.pow(10, precision || 0).toFixed(precision < 0 ? -precision : 0);
-		return Math.round(this * precision) / precision;
-	},
-
-	times: function(fn, bind){
-		for (var i = 0; i < this; i++) fn.call(bind, i, this);
-	},
-
-	toFloat: function(){
-		return parseFloat(this);
-	},
-
-	toInt: function(base){
-		return parseInt(this, base || 10);
-	}
-
-});
-
-Number.alias('each', 'times');
-
-(function(math){
-	var methods = {};
-	math.each(function(name){
-		if (!Number[name]) methods[name] = function(){
-			return Math[name].apply(null, [this].concat(Array.from(arguments)));
-		};
-	});
-	Number.implement(methods);
-})(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']);
-
-
-/*
----
-
-name: Function
-
-description: Contains Function Prototypes like create, bind, pass, and delay.
-
-license: MIT-style license.
-
-requires: Type
-
-provides: Function
-
-...
-*/
-
-Function.extend({
-
-	attempt: function(){
-		for (var i = 0, l = arguments.length; i < l; i++){
-			try {
-				return arguments[i]();
-			} catch (e){}
-		}
-		return null;
-	}
-
-});
-
-Function.implement({
-
-	attempt: function(args, bind){
-		try {
-			return this.apply(bind, Array.from(args));
-		} catch (e){}
-
-		return null;
-	},
-
-	/*<!ES5-bind>*/
-	bind: function(that){
-		var self = this,
-			args = arguments.length > 1 ? Array.slice(arguments, 1) : null,
-			F = function(){};
-
-		var bound = function(){
-			var context = that, length = arguments.length;
-			if (this instanceof bound){
-				F.prototype = self.prototype;
-				context = new F;
-			}
-			var result = (!args && !length)
-				? self.call(context)
-				: self.apply(context, args && length ? args.concat(Array.slice(arguments)) : args || arguments);
-			return context == that ? result : context;
-		};
-		return bound;
-	},
-	/*</!ES5-bind>*/
-
-	pass: function(args, bind){
-		var self = this;
-		if (args != null) args = Array.from(args);
-		return function(){
-			return self.apply(bind, args || arguments);
-		};
-	},
-
-	delay: function(delay, bind, args){
-		return setTimeout(this.pass((args == null ? [] : args), bind), delay);
-	},
-
-	periodical: function(periodical, bind, args){
-		return setInterval(this.pass((args == null ? [] : args), bind), periodical);
-	}
-
-});
-
-//<1.2compat>
-
-delete Function.prototype.bind;
-
-Function.implement({
-
-	create: function(options){
-		var self = this;
-		options = options || {};
-		return function(event){
-			var args = options.arguments;
-			args = (args != null) ? Array.from(args) : Array.slice(arguments, (options.event) ? 1 : 0);
-			if (options.event) args = [event || window.event].extend(args);
-			var returns = function(){
-				return self.apply(options.bind || null, args);
-			};
-			if (options.delay) return setTimeout(returns, options.delay);
-			if (options.periodical) return setInterval(returns, options.periodical);
-			if (options.attempt) return Function.attempt(returns);
-			return returns();
-		};
-	},
-
-	bind: function(bind, args){
-		var self = this;
-		if (args != null) args = Array.from(args);
-		return function(){
-			return self.apply(bind, args || arguments);
-		};
-	},
-
-	bindWithEvent: function(bind, args){
-		var self = this;
-		if (args != null) args = Array.from(args);
-		return function(event){
-			return self.apply(bind, (args == null) ? arguments : [event].concat(args));
-		};
-	},
-
-	run: function(args, bind){
-		return this.apply(bind, Array.from(args));
-	}
-
-});
-
-if (Object.create == Function.prototype.create) Object.create = null;
-
-var $try = Function.attempt;
-
-//</1.2compat>
-
-
-/*
----
-
-name: Object
-
-description: Object generic methods
-
-license: MIT-style license.
-
-requires: Type
-
-provides: [Object, Hash]
-
-...
-*/
-
-(function(){
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-Object.extend({
-
-	subset: function(object, keys){
-		var results = {};
-		for (var i = 0, l = keys.length; i < l; i++){
-			var k = keys[i];
-			if (k in object) results[k] = object[k];
-		}
-		return results;
-	},
-
-	map: function(object, fn, bind){
-		var results = {};
-		for (var key in object){
-			if (hasOwnProperty.call(object, key)) results[key] = fn.call(bind, object[key], key, object);
-		}
-		return results;
-	},
-
-	filter: function(object, fn, bind){
-		var results = {};
-		for (var key in object){
-			var value = object[key];
-			if (hasOwnProperty.call(object, key) && fn.call(bind, value, key, object)) results[key] = value;
-		}
-		return results;
-	},
-
-	every: function(object, fn, bind){
-		for (var key in object){
-			if (hasOwnProperty.call(object, key) && !fn.call(bind, object[key], key)) return false;
-		}
-		return true;
-	},
-
-	some: function(object, fn, bind){
-		for (var key in object){
-			if (hasOwnProperty.call(object, key) && fn.call(bind, object[key], key)) return true;
-		}
-		return false;
-	},
-
-	keys: function(object){
-		var keys = [];
-		for (var key in object){
-			if (hasOwnProperty.call(object, key)) keys.push(key);
-		}
-		return keys;
-	},
-
-	values: function(object){
-		var values = [];
-		for (var key in object){
-			if (hasOwnProperty.call(object, key)) values.push(object[key]);
-		}
-		return values;
-	},
-
-	getLength: function(object){
-		return Object.keys(object).length;
-	},
-
-	keyOf: function(object, value){
-		for (var key in object){
-			if (hasOwnProperty.call(object, key) && object[key] === value) return key;
-		}
-		return null;
-	},
-
-	contains: function(object, value){
-		return Object.keyOf(object, value) != null;
-	},
-
-	toQueryString: function(object, base){
-		var queryString = [];
-
-		Object.each(object, function(value, key){
-			if (base) key = base + '[' + key + ']';
-			var result;
-			switch (typeOf(value)){
-				case 'object': result = Object.toQueryString(value, key); break;
-				case 'array':
-					var qs = {};
-					value.each(function(val, i){
-						qs[i] = val;
-					});
-					result = Object.toQueryString(qs, key);
-				break;
-				default: result = key + '=' + encodeURIComponent(value);
-			}
-			if (value != null) queryString.push(result);
-		});
-
-		return queryString.join('&');
-	}
-
-});
-
-})();
-
-//<1.2compat>
-
-Hash.implement({
-
-	has: Object.prototype.hasOwnProperty,
-
-	keyOf: function(value){
-		return Object.keyOf(this, value);
-	},
-
-	hasValue: function(value){
-		return Object.contains(this, value);
-	},
-
-	extend: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.set(this, key, value);
-		}, this);
-		return this;
-	},
-
-	combine: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.include(this, key, value);
-		}, this);
-		return this;
-	},
-
-	erase: function(key){
-		if (this.hasOwnProperty(key)) delete this[key];
-		return this;
-	},
-
-	get: function(key){
-		return (this.hasOwnProperty(key)) ? this[key] : null;
-	},
-
-	set: function(key, value){
-		if (!this[key] || this.hasOwnProperty(key)) this[key] = value;
-		return this;
-	},
-
-	empty: function(){
-		Hash.each(this, function(value, key){
-			delete this[key];
-		}, this);
-		return this;
-	},
-
-	include: function(key, value){
-		if (this[key] == null) this[key] = value;
-		return this;
-	},
-
-	map: function(fn, bind){
-		return new Hash(Object.map(this, fn, bind));
-	},
-
-	filter: function(fn, bind){
-		return new Hash(Object.filter(this, fn, bind));
-	},
-
-	every: function(fn, bind){
-		return Object.every(this, fn, bind);
-	},
-
-	some: function(fn, bind){
-		return Object.some(this, fn, bind);
-	},
-
-	getKeys: function(){
-		return Object.keys(this);
-	},
-
-	getValues: function(){
-		return Object.values(this);
-	},
-
-	toQueryString: function(base){
-		return Object.toQueryString(this, base);
-	}
-
-});
-
-Hash.extend = Object.append;
-
-Hash.alias({indexOf: 'keyOf', contains: 'hasValue'});
-
-//</1.2compat>
-
 
 /*
 ---
@@ -1213,37 +856,52 @@ provides: [Browser, Window, Document]
 var document = this.document;
 var window = document.window = this;
 
-var ua = navigator.userAgent.toLowerCase(),
-	platform = navigator.platform.toLowerCase(),
-	UA = ua.match(/(opera|ie|firefox|chrome|version)[\s\/:]([\w\d\.]+)?.*?(safari|version[\s\/:]([\w\d\.]+)|$)/) || [null, 'unknown', 0],
-	mode = UA[1] == 'ie' && document.documentMode;
+var parse = function(ua, platform){
+	ua = ua.toLowerCase();
+	platform = (platform ? platform.toLowerCase() : '');
 
-var Browser = this.Browser = {
+	// chrome is included in the edge UA, so need to check for edge first,
+	// before checking if it's chrome.
+	var UA = ua.match(/(edge)[\s\/:]([\w\d\.]+)/);
+	if (!UA){
+		UA = ua.match(/(opera|ie|firefox|chrome|trident|crios|version)[\s\/:]([\w\d\.]+)?.*?(safari|(?:rv[\s\/:]|version[\s\/:])([\w\d\.]+)|$)/) || [null, 'unknown', 0];
+	}
 
-	extend: Function.prototype.extend,
+	if (UA[1] == 'trident'){
+		UA[1] = 'ie';
+		if (UA[4]) UA[2] = UA[4];
+	} else if (UA[1] == 'crios'){
+		UA[1] = 'chrome';
+	}
 
-	name: (UA[1] == 'version') ? UA[3] : UA[1],
+	platform = ua.match(/ip(?:ad|od|hone)/) ? 'ios' : (ua.match(/(?:webos|android)/) || ua.match(/mac|win|linux/) || ['other'])[0];
+	if (platform == 'win') platform = 'windows';
 
-	version: mode || parseFloat((UA[1] == 'opera' && UA[4]) ? UA[4] : UA[2]),
+	return {
+		extend: Function.prototype.extend,
+		name: (UA[1] == 'version') ? UA[3] : UA[1],
+		version: parseFloat((UA[1] == 'opera' && UA[4]) ? UA[4] : UA[2]),
+		platform: platform
+	};
+};
 
-	Platform: {
-		name: ua.match(/ip(?:ad|od|hone)/) ? 'ios' : (ua.match(/(?:webos|android)/) || platform.match(/mac|win|linux/) || ['other'])[0]
-	},
+var Browser = this.Browser = parse(navigator.userAgent, navigator.platform);
 
+if (Browser.name == 'ie' && document.documentMode){
+	Browser.version = document.documentMode;
+}
+
+Browser.extend({
 	Features: {
 		xpath: !!(document.evaluate),
 		air: !!(window.runtime),
 		query: !!(document.querySelector),
 		json: !!(window.JSON)
 	},
+	parseUA: parse
+});
 
-	Plugins: {}
 
-};
-
-Browser[Browser.name] = true;
-Browser[Browser.name + parseInt(Browser.version, 10)] = true;
-Browser.Platform[Browser.Platform.name] = true;
 
 // Request
 
@@ -1276,18 +934,7 @@ Browser.Request = (function(){
 
 Browser.Features.xhr = !!(Browser.Request);
 
-// Flash detection
 
-var version = (Function.attempt(function(){
-	return navigator.plugins['Shockwave Flash'].description;
-}, function(){
-	return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
-}) || '0 r0').match(/\d+/g);
-
-Browser.Plugins.Flash = {
-	version: Number(version[0] || '0.' + version[1]) || 0,
-	build: Number(version[2]) || 0
-};
 
 // String scripts
 
@@ -1327,7 +974,7 @@ Browser.extend({
 
 this.Window = this.$constructor = new Type('Window', function(){});
 
-this.$family = Function.from('window').hide();
+this.$family = Function.convert('window').hide();
 
 Window.mirror(function(name, method){
 	window[name] = method;
@@ -1335,7 +982,7 @@ Window.mirror(function(name, method){
 
 this.Document = document.$constructor = new Type('Document', function(){});
 
-document.$family = Function.from('document').hide();
+document.$family = Function.convert('document').hide();
 
 Document.mirror(function(name, method){
 	document[name] = method;
@@ -1345,7 +992,7 @@ document.html = document.documentElement;
 if (!document.head) document.head = document.getElementsByTagName('head')[0];
 
 if (document.execCommand) try {
-	document.execCommand("BackgroundImageCache", false, true);
+	document.execCommand('BackgroundImageCache', false, true);
 } catch (e){}
 
 /*<ltIE9>*/
@@ -1353,16 +1000,17 @@ if (this.attachEvent && !this.addEventListener){
 	var unloadEvent = function(){
 		this.detachEvent('onunload', unloadEvent);
 		document.head = document.html = document.window = null;
+		window = this.Window = document = null;
 	};
 	this.attachEvent('onunload', unloadEvent);
 }
 
 // IE fails on collections and <select>.options (refers to <select>)
-var arrayFrom = Array.from;
+var arrayFrom = Array.convert;
 try {
 	arrayFrom(document.html.childNodes);
-} catch(e){
-	Array.from = function(item){
+} catch (e){
+	Array.convert = function(item){
 		if (typeof item != 'string' && Type.isEnumerable(item) && typeOf(item) != 'array'){
 			var i = item.length, array = new Array(i);
 			while (i--) array[i] = item[i];
@@ -1376,204 +1024,16 @@ try {
 	['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice'].each(function(name){
 		var method = prototype[name];
 		Array[name] = function(item){
-			return method.apply(Array.from(item), slice.call(arguments, 1));
+			return method.apply(Array.convert(item), slice.call(arguments, 1));
 		};
 	});
 }
 /*</ltIE9>*/
 
-//<1.2compat>
 
-if (Browser.Platform.ios) Browser.Platform.ipod = true;
-
-Browser.Engine = {};
-
-var setEngine = function(name, version){
-	Browser.Engine.name = name;
-	Browser.Engine[name + version] = true;
-	Browser.Engine.version = version;
-};
-
-if (Browser.ie){
-	Browser.Engine.trident = true;
-
-	switch (Browser.version){
-		case 6: setEngine('trident', 4); break;
-		case 7: setEngine('trident', 5); break;
-		case 8: setEngine('trident', 6);
-	}
-}
-
-if (Browser.firefox){
-	Browser.Engine.gecko = true;
-
-	if (Browser.version >= 3) setEngine('gecko', 19);
-	else setEngine('gecko', 18);
-}
-
-if (Browser.safari || Browser.chrome){
-	Browser.Engine.webkit = true;
-
-	switch (Browser.version){
-		case 2: setEngine('webkit', 419); break;
-		case 3: setEngine('webkit', 420); break;
-		case 4: setEngine('webkit', 525);
-	}
-}
-
-if (Browser.opera){
-	Browser.Engine.presto = true;
-
-	if (Browser.version >= 9.6) setEngine('presto', 960);
-	else if (Browser.version >= 9.5) setEngine('presto', 950);
-	else setEngine('presto', 925);
-}
-
-if (Browser.name == 'unknown'){
-	switch ((ua.match(/(?:webkit|khtml|gecko)/) || [])[0]){
-		case 'webkit':
-		case 'khtml':
-			Browser.Engine.webkit = true;
-		break;
-		case 'gecko':
-			Browser.Engine.gecko = true;
-	}
-}
-
-this.$exec = Browser.exec;
-
-//</1.2compat>
 
 })();
 
-
-/*
----
-
-name: Event
-
-description: Contains the Event Type, to make the event object cross-browser.
-
-license: MIT-style license.
-
-requires: [Window, Document, Array, Function, String, Object]
-
-provides: Event
-
-...
-*/
-
-(function() {
-
-var _keys = {};
-
-var DOMEvent = this.DOMEvent = new Type('DOMEvent', function(event, win){
-	if (!win) win = window;
-	event = event || win.event;
-	if (event.$extended) return event;
-	this.event = event;
-	this.$extended = true;
-	this.shift = event.shiftKey;
-	this.control = event.ctrlKey;
-	this.alt = event.altKey;
-	this.meta = event.metaKey;
-	var type = this.type = event.type;
-	var target = event.target || event.srcElement;
-	while (target && target.nodeType == 3) target = target.parentNode;
-	this.target = document.id(target);
-
-	if (type.indexOf('key') == 0){
-		var code = this.code = (event.which || event.keyCode);
-		this.key = _keys[code]/*<1.3compat>*/ || Object.keyOf(Event.Keys, code)/*</1.3compat>*/;
-		if (type == 'keydown'){
-			if (code > 111 && code < 124) this.key = 'f' + (code - 111);
-			else if (code > 95 && code < 106) this.key = code - 96;
-		}
-		if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
-	} else if (type == 'click' || type == 'dblclick' || type == 'contextmenu' || type == 'DOMMouseScroll' || type.indexOf('mouse') == 0){
-		var doc = win.document;
-		doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
-		this.page = {
-			x: (event.pageX != null) ? event.pageX : event.clientX + doc.scrollLeft,
-			y: (event.pageY != null) ? event.pageY : event.clientY + doc.scrollTop
-		};
-		this.client = {
-			x: (event.pageX != null) ? event.pageX - win.pageXOffset : event.clientX,
-			y: (event.pageY != null) ? event.pageY - win.pageYOffset : event.clientY
-		};
-		if (type == 'DOMMouseScroll' || type == 'mousewheel')
-			this.wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
-
-		this.rightClick = (event.which == 3 || event.button == 2);
-		if (type == 'mouseover' || type == 'mouseout'){
-			var related = event.relatedTarget || event[(type == 'mouseover' ? 'from' : 'to') + 'Element'];
-			while (related && related.nodeType == 3) related = related.parentNode;
-			this.relatedTarget = document.id(related);
-		}
-	} else if (type.indexOf('touch') == 0 || type.indexOf('gesture') == 0){
-		this.rotation = event.rotation;
-		this.scale = event.scale;
-		this.targetTouches = event.targetTouches;
-		this.changedTouches = event.changedTouches;
-		var touches = this.touches = event.touches;
-		if (touches && touches[0]){
-			var touch = touches[0];
-			this.page = {x: touch.pageX, y: touch.pageY};
-			this.client = {x: touch.clientX, y: touch.clientY};
-		}
-	}
-
-	if (!this.client) this.client = {};
-	if (!this.page) this.page = {};
-});
-
-DOMEvent.implement({
-
-	stop: function(){
-		return this.preventDefault().stopPropagation();
-	},
-
-	stopPropagation: function(){
-		if (this.event.stopPropagation) this.event.stopPropagation();
-		else this.event.cancelBubble = true;
-		return this;
-	},
-
-	preventDefault: function(){
-		if (this.event.preventDefault) this.event.preventDefault();
-		else this.event.returnValue = false;
-		return this;
-	}
-
-});
-
-DOMEvent.defineKey = function(code, key){
-	_keys[code] = key;
-	return this;
-};
-
-DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
-
-DOMEvent.defineKeys({
-	'38': 'up', '40': 'down', '37': 'left', '39': 'right',
-	'27': 'esc', '32': 'space', '8': 'backspace', '9': 'tab',
-	'46': 'delete', '13': 'enter'
-});
-
-})();
-
-/*<1.3compat>*/
-var Event = DOMEvent;
-Event.Keys = {};
-/*</1.3compat>*/
-
-/*<1.2compat>*/
-
-Event.Keys = new Hash(Event.Keys);
-
-/*</1.2compat>*/
-
-
 /*
 ---
 
@@ -1599,6 +1059,7 @@ var Class = this.Class = new Type('Class', function(params){
 		reset(this);
 		if (newClass.$prototyping) return this;
 		this.$caller = null;
+		this.$family = null;
 		var value = (this.initialize) ? this.initialize.apply(this, arguments) : this;
 		this.$caller = this.caller = null;
 		return value;
@@ -1628,7 +1089,7 @@ var reset = function(object){
 				var F = function(){};
 				F.prototype = value;
 				object[key] = reset(new F);
-			break;
+				break;
 			case 'array': object[key] = value.clone(); break;
 		}
 	}
@@ -1681,7 +1142,7 @@ Class.Mutators = {
 	},
 
 	Implements: function(items){
-		Array.from(items).each(function(item){
+		Array.convert(items).each(function(item){
 			var instance = new item;
 			for (var key in instance) implement.call(this, key, instance[key], true);
 		}, this);
@@ -1690,7 +1151,6 @@ Class.Mutators = {
 
 })();
 
-
 /*
 ---
 
@@ -1742,9 +1202,7 @@ this.Events = new Class({
 	addEvent: function(type, fn, internal){
 		type = removeOn(type);
 
-		/*<1.2compat>*/
-		if (fn == $empty) return this;
-		/*</1.2compat>*/
+		
 
 		this.$events[type] = (this.$events[type] || []).include(fn);
 		if (internal) fn.internal = true;
@@ -1760,7 +1218,7 @@ this.Events = new Class({
 		type = removeOn(type);
 		var events = this.$events[type];
 		if (!events) return this;
-		args = Array.from(args);
+		args = Array.convert(args);
 		events.each(function(fn){
 			if (delay) fn.delay(delay, this, args);
 			else fn.apply(this, args);
@@ -1772,7 +1230,7 @@ this.Events = new Class({
 		type = removeOn(type);
 		var events = this.$events[type];
 		if (events && !fn.internal){
-			var index =  events.indexOf(fn);
+			var index = events.indexOf(fn);
 			if (index != -1) delete events[index];
 		}
 		return this;
@@ -1813,6 +1271,352 @@ this.Options = new Class({
 
 })();
 
+/*
+---
+
+name: Class.Thenable
+
+description: Contains a Utility Class that can be implemented into your own Classes to make them "thenable".
+
+license: MIT-style license.
+
+requires: Class
+
+provides: [Class.Thenable]
+
+...
+*/
+
+(function(){
+
+var STATE_PENDING = 0,
+	STATE_FULFILLED = 1,
+	STATE_REJECTED = 2;
+
+var Thenable = Class.Thenable = new Class({
+
+	$thenableState: STATE_PENDING,
+	$thenableResult: null,
+	$thenableReactions: [],
+
+	resolve: function(value){
+		resolve(this, value);
+		return this;
+	},
+
+	reject: function(reason){
+		reject(this, reason);
+		return this;
+	},
+
+	getThenableState: function(){
+		switch (this.$thenableState){
+			case STATE_PENDING:
+				return 'pending';
+
+			case STATE_FULFILLED:
+				return 'fulfilled';
+
+			case STATE_REJECTED:
+				return 'rejected';
+		}
+	},
+
+	resetThenable: function(reason){
+		reject(this, reason);
+		reset(this);
+		return this;
+	},
+
+	then: function(onFulfilled, onRejected){
+		if (typeof onFulfilled !== 'function') onFulfilled = 'Identity';
+		if (typeof onRejected !== 'function') onRejected = 'Thrower';
+
+		var thenable = new Thenable();
+
+		this.$thenableReactions.push({
+			thenable: thenable,
+			fulfillHandler: onFulfilled,
+			rejectHandler: onRejected
+		});
+
+		if (this.$thenableState !== STATE_PENDING){
+			react(this);
+		}
+
+		return thenable;
+	},
+
+	'catch': function(onRejected){
+		return this.then(null, onRejected);
+	}
+
+});
+
+Thenable.extend({
+	resolve: function(value){
+		var thenable;
+		if (value instanceof Thenable){
+			thenable = value;
+		} else {
+			thenable = new Thenable();
+			resolve(thenable, value);
+		}
+		return thenable;
+	},
+	reject: function(reason){
+		var thenable = new Thenable();
+		reject(thenable, reason);
+		return thenable;
+	}
+});
+
+// Private functions
+
+function resolve(thenable, value){
+	if (thenable.$thenableState === STATE_PENDING){
+		if (thenable === value){
+			reject(thenable, new TypeError('Tried to resolve a thenable with itself.'));
+		} else if (value && (typeof value === 'object' || typeof value === 'function')){
+			var then;
+			try {
+				then = value.then;
+			} catch (exception){
+				reject(thenable, exception);
+			}
+			if (typeof then === 'function'){
+				var resolved = false;
+				defer(function(){
+					try {
+						then.call(
+							value,
+							function(nextValue){
+								if (!resolved){
+									resolved = true;
+									resolve(thenable, nextValue);
+								}
+							},
+							function(reason){
+								if (!resolved){
+									resolved = true;
+									reject(thenable, reason);
+								}
+							}
+						);
+					} catch (exception){
+						if (!resolved){
+							resolved = true;
+							reject(thenable, exception);
+						}
+					}
+				});
+			} else {
+				fulfill(thenable, value);
+			}
+		} else {
+			fulfill(thenable, value);
+		}
+	}
+}
+
+function fulfill(thenable, value){
+	if (thenable.$thenableState === STATE_PENDING){
+		thenable.$thenableResult = value;
+		thenable.$thenableState = STATE_FULFILLED;
+
+		react(thenable);
+	}
+}
+
+function reject(thenable, reason){
+	if (thenable.$thenableState === STATE_PENDING){
+		thenable.$thenableResult = reason;
+		thenable.$thenableState = STATE_REJECTED;
+
+		react(thenable);
+	}
+}
+
+function reset(thenable){
+	if (thenable.$thenableState !== STATE_PENDING){
+		thenable.$thenableResult = null;
+		thenable.$thenableState = STATE_PENDING;
+	}
+}
+
+function react(thenable){
+	var state = thenable.$thenableState,
+		result = thenable.$thenableResult,
+		reactions = thenable.$thenableReactions,
+		type;
+
+	if (state === STATE_FULFILLED){
+		thenable.$thenableReactions = [];
+		type = 'fulfillHandler';
+	} else if (state == STATE_REJECTED){
+		thenable.$thenableReactions = [];
+		type = 'rejectHandler';
+	}
+
+	if (type){
+		defer(handle.pass([result, reactions, type]));
+	}
+}
+
+function handle(result, reactions, type){
+	for (var i = 0, l = reactions.length; i < l; ++i){
+		var reaction = reactions[i],
+			handler = reaction[type];
+
+		if (handler === 'Identity'){
+			resolve(reaction.thenable, result);
+		} else if (handler === 'Thrower'){
+			reject(reaction.thenable, result);
+		} else {
+			try {
+				resolve(reaction.thenable, handler(result));
+			} catch (exception){
+				reject(reaction.thenable, exception);
+			}
+		}
+	}
+}
+
+var defer;
+if (typeof process !== 'undefined' && typeof process.nextTick === 'function'){
+	defer = process.nextTick;
+} else if (typeof setImmediate !== 'undefined'){
+	defer = setImmediate;
+} else {
+	defer = function(fn){
+		setTimeout(fn, 0);
+	};
+}
+
+})();
+
+/*
+---
+
+name: Object
+
+description: Object generic methods
+
+license: MIT-style license.
+
+requires: Type
+
+provides: [Object, Hash]
+
+...
+*/
+
+(function(){
+
+Object.extend({
+
+	subset: function(object, keys){
+		var results = {};
+		for (var i = 0, l = keys.length; i < l; i++){
+			var k = keys[i];
+			if (k in object) results[k] = object[k];
+		}
+		return results;
+	},
+
+	map: function(object, fn, bind){
+		var results = {};
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			results[key] = fn.call(bind, object[key], key, object);
+		}
+		return results;
+	},
+
+	filter: function(object, fn, bind){
+		var results = {};
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i], value = object[key];
+			if (fn.call(bind, value, key, object)) results[key] = value;
+		}
+		return results;
+	},
+
+	every: function(object, fn, bind){
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			if (!fn.call(bind, object[key], key)) return false;
+		}
+		return true;
+	},
+
+	some: function(object, fn, bind){
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			if (fn.call(bind, object[key], key)) return true;
+		}
+		return false;
+	},
+
+	values: function(object){
+		var values = [];
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var k = keys[i];
+			values.push(object[k]);
+		}
+		return values;
+	},
+
+	getLength: function(object){
+		return Object.keys(object).length;
+	},
+
+	keyOf: function(object, value){
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			if (object[key] === value) return key;
+		}
+		return null;
+	},
+
+	contains: function(object, value){
+		return Object.keyOf(object, value) != null;
+	},
+
+	toQueryString: function(object, base){
+		var queryString = [];
+
+		Object.each(object, function(value, key){
+			if (base) key = base + '[' + key + ']';
+			var result;
+			switch (typeOf(value)){
+				case 'object': result = Object.toQueryString(value, key); break;
+				case 'array':
+					var qs = {};
+					value.each(function(val, i){
+						qs[i] = val;
+					});
+					result = Object.toQueryString(qs, key);
+					break;
+				default: result = key + '=' + encodeURIComponent(value);
+			}
+			if (value != null) queryString.push(result);
+		});
+
+		return queryString.join('&');
+	}
+
+});
+
+})();
+
+
 
 /*
 ---
@@ -1914,7 +1718,7 @@ __END__
 	)"
 */
 	"^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)"
-	.replace(/<combinator>/, '[' + escapeRegExp(">+~`!@$%^&={}\\;</") + ']')
+	.replace(/<combinator>/, '[' + escapeRegExp('>+~`!@$%^&={}\\;</') + ']')
 	.replace(/<unicode>/g, '(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
 	.replace(/<unicode1>/g, '(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
 );
@@ -2045,7 +1849,6 @@ if (!this.Slick) this.Slick = Slick;
 
 }).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
 
-
 /*
 ---
 name: Slick.Finder
@@ -2130,7 +1933,7 @@ local.setDocument = function(document){
 	try {
 		testNode.innerHTML = '<a id="'+id+'"></a>';
 		features.isHTMLDocument = !!document.getElementById(id);
-	} catch(e){};
+	} catch (e){}
 
 	if (features.isHTMLDocument){
 
@@ -2145,7 +1948,7 @@ local.setDocument = function(document){
 			testNode.innerHTML = 'foo</foo>';
 			selected = testNode.getElementsByTagName('*');
 			starSelectsClosed = (selected && !!selected.length && selected[0].nodeName.charAt(0) == '/');
-		} catch(e){};
+		} catch (e){};
 
 		features.brokenStarGEBTN = starSelectsComments || starSelectsClosed;
 
@@ -2153,7 +1956,7 @@ local.setDocument = function(document){
 		try {
 			testNode.innerHTML = '<a name="'+ id +'"></a><b id="'+ id +'"></b>';
 			features.idGetsName = document.getElementById(id) === testNode.firstChild;
-		} catch(e){};
+		} catch (e){}
 
 		if (testNode.getElementsByClassName){
 
@@ -2163,13 +1966,13 @@ local.setDocument = function(document){
 				testNode.getElementsByClassName('b').length;
 				testNode.firstChild.className = 'b';
 				cachedGetElementsByClassName = (testNode.getElementsByClassName('b').length != 2);
-			} catch(e){};
+			} catch (e){};
 
 			// Opera 9.6 getElementsByClassName doesnt detects the class if its not the first one
 			try {
 				testNode.innerHTML = '<a class="a"></a><a class="f b a"></a>';
 				brokenSecondClassNameGEBCN = (testNode.getElementsByClassName('a').length != 2);
-			} catch(e){};
+			} catch (e){}
 
 			features.brokenGEBCN = cachedGetElementsByClassName || brokenSecondClassNameGEBCN;
 		}
@@ -2180,25 +1983,25 @@ local.setDocument = function(document){
 				testNode.innerHTML = 'foo</foo>';
 				selected = testNode.querySelectorAll('*');
 				features.starSelectsClosedQSA = (selected && !!selected.length && selected[0].nodeName.charAt(0) == '/');
-			} catch(e){};
+			} catch (e){}
 
 			// Safari 3.2 querySelectorAll doesnt work with mixedcase on quirksmode
 			try {
 				testNode.innerHTML = '<a class="MiX"></a>';
 				features.brokenMixedCaseQSA = !testNode.querySelectorAll('.MiX').length;
-			} catch(e){};
+			} catch (e){}
 
 			// Webkit and Opera dont return selected options on querySelectorAll
 			try {
 				testNode.innerHTML = '<select><option selected="selected">a</option></select>';
 				features.brokenCheckedQSA = (testNode.querySelectorAll(':checked').length == 0);
-			} catch(e){};
+			} catch (e){};
 
 			// IE returns incorrect results for attr[*^$]="" selectors on querySelectorAll
 			try {
 				testNode.innerHTML = '<a class=""></a>';
 				features.brokenEmptyAttributeQSA = (testNode.querySelectorAll('[class*=""]').length != 0);
-			} catch(e){};
+			} catch (e){}
 
 		}
 
@@ -2206,16 +2009,16 @@ local.setDocument = function(document){
 		try {
 			testNode.innerHTML = '<form action="s"><input id="action"/></form>';
 			brokenFormAttributeGetter = (testNode.firstChild.getAttribute('action') != 's');
-		} catch(e){};
+		} catch (e){}
 
 		// native matchesSelector function
 
-		features.nativeMatchesSelector = root.matchesSelector || /*root.msMatchesSelector ||*/ root.mozMatchesSelector || root.webkitMatchesSelector;
+		features.nativeMatchesSelector = root.matches || /*root.msMatchesSelector ||*/ root.mozMatchesSelector || root.webkitMatchesSelector;
 		if (features.nativeMatchesSelector) try {
 			// if matchesSelector trows errors on incorrect sintaxes we can use it
 			features.nativeMatchesSelector.call(root, ':slick');
 			features.nativeMatchesSelector = null;
-		} catch(e){};
+		} catch (e){}
 
 	}
 
@@ -2223,7 +2026,7 @@ local.setDocument = function(document){
 		root.slick_expando = 1;
 		delete root.slick_expando;
 		features.getUID = this.getUIDHTML;
-	} catch(e) {
+	} catch (e){
 		features.getUID = this.getUIDXML;
 	}
 
@@ -2244,9 +2047,9 @@ local.setDocument = function(document){
 
 	// hasAttribute
 
-	features.hasAttribute = (root && this.isNativeCode(root.hasAttribute)) ? function(node, attribute) {
+	features.hasAttribute = (root && this.isNativeCode(root.hasAttribute)) ? function(node, attribute){
 		return node.hasAttribute(attribute);
-	} : function(node, attribute) {
+	} : function(node, attribute){
 		node = node.getAttributeNode(attribute);
 		return !!(node && (node.specified || node.nodeValue));
 	};
@@ -2287,7 +2090,7 @@ local.setDocument = function(document){
 		bRange.setStart(b, 0);
 		bRange.setEnd(b, 0);
 		return aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
-	} : null ;
+	} : null;
 
 	root = null;
 
@@ -2312,7 +2115,7 @@ local.search = function(context, expression, append, first){
 
 	// setup
 
-	var parsed, i,
+	var parsed, i, node, nodes,
 		uniques = this.uniques = {},
 		hasOthers = !!(append && append.length),
 		contextIsDocument = (context.nodeType == 9);
@@ -2328,11 +2131,10 @@ local.search = function(context, expression, append, first){
 
 		/*<simple-selectors-override>*/
 		var simpleSelector = expression.match(reSimpleSelector);
-		simpleSelectors: if (simpleSelector) {
+		simpleSelectors: if (simpleSelector){
 
 			var symbol = simpleSelector[1],
-				name = simpleSelector[2],
-				node, nodes;
+				name = simpleSelector[2];
 
 			if (!symbol){
 
@@ -2381,7 +2183,7 @@ local.search = function(context, expression, append, first){
 		/*</simple-selectors-override>*/
 
 		/*<query-selector-override>*/
-		querySelector: if (context.querySelectorAll) {
+		querySelector: if (context.querySelectorAll){
 
 			if (!this.isHTMLDocument
 				|| qsaFailExpCache[expression]
@@ -2397,11 +2199,11 @@ local.search = function(context, expression, append, first){
 				|| Slick.disableQSA
 			) break querySelector;
 
-			var _expression = expression, _context = context;
+			var _expression = expression, _context = context, currentId;
 			if (!contextIsDocument){
 				// non-document rooted QSA
 				// credits to Andrew Dupont
-				var currentId = _context.getAttribute('id'), slickid = 'slickid__';
+				currentId = _context.getAttribute('id'), slickid = 'slickid__';
 				_context.setAttribute('id', slickid);
 				_expression = '#' + slickid + ' ' + _expression;
 				context = _context.parentNode;
@@ -2410,7 +2212,7 @@ local.search = function(context, expression, append, first){
 			try {
 				if (first) return context.querySelector(_expression) || null;
 				else nodes = context.querySelectorAll(_expression);
-			} catch(e) {
+			} catch (e){
 				qsaFailExpCache[expression] = 1;
 				break querySelector;
 			} finally {
@@ -2609,14 +2411,14 @@ local.matchNode = function(node, selector){
 	if (this.isHTMLDocument && this.nativeMatchesSelector){
 		try {
 			return this.nativeMatchesSelector.call(node, selector.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g, '[$1="$2"]'));
-		} catch(matchError) {}
+		} catch (matchError){}
 	}
 
 	var parsed = this.Slick.parse(selector);
 	if (!parsed) return true;
 
 	// simple (single) selectors
-	var expressions = parsed.expressions, simpleExpCounter = 0, i;
+	var expressions = parsed.expressions, simpleExpCounter = 0, i, currentExpression;
 	for (i = 0; (currentExpression = expressions[i]); i++){
 		if (currentExpression.length == 1){
 			var exp = currentExpression[0];
@@ -3032,7 +2834,6 @@ if (!this.Slick) this.Slick = Slick;
 
 }).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
 
-
 /*
 ---
 
@@ -3044,12 +2845,12 @@ license: MIT-style license.
 
 requires: [Window, Document, Array, String, Function, Object, Number, Slick.Parser, Slick.Finder]
 
-provides: [Element, Elements, $, $$, Iframe, Selectors]
+provides: [Element, Elements, $, $$, IFrame, Selectors]
 
 ...
 */
 
-var Element = function(tag, props){
+var Element = this.Element = function(tag, props){
 	var konstructor = Element.Constructors[tag];
 	if (konstructor) return konstructor(props);
 	if (typeof tag != 'string') return document.id(tag).set(props);
@@ -3108,7 +2909,7 @@ if (!Browser.Element){
 
 	Element.Prototype = {
 		'$constructor': Element,
-		'$family': Function.from('element').hide()
+		'$family': Function.convert('element').hide()
 	};
 
 	Element.mirror(function(name, method){
@@ -3118,11 +2919,7 @@ if (!Browser.Element){
 
 Element.Constructors = {};
 
-//<1.2compat>
 
-Element.Constructors = new Hash;
-
-//</1.2compat>
 
 var IFrame = new Type('IFrame', function(){
 	var params = Array.link(arguments, {
@@ -3213,11 +3010,7 @@ new Type('Elements', Elements).implement({
 
 });
 
-//<1.2compat>
 
-Elements.alias('extend', 'append');
-
-//</1.2compat>
 
 (function(){
 
@@ -3241,7 +3034,7 @@ Array.mirror(Elements);
 /*<ltIE8>*/
 var createElementAcceptsHTML;
 try {
-    createElementAcceptsHTML = (document.createElement('<input name=x>').name == 'x');
+	createElementAcceptsHTML = (document.createElement('<input name=x>').name == 'x');
 } catch (e){}
 
 var escapeQuotes = function(html){
@@ -3249,20 +3042,44 @@ var escapeQuotes = function(html){
 };
 /*</ltIE8>*/
 
+/*<ltIE9>*/
+// #2479 - IE8 Cannot set HTML of style element
+var canChangeStyleHTML = (function(){
+	var div = document.createElement('style'),
+		flag = false;
+	try {
+		div.innerHTML = '#justTesing{margin: 0px;}';
+		flag = !!div.innerHTML;
+	} catch (e){}
+	return flag;
+})();
+/*</ltIE9>*/
+
 Document.implement({
 
 	newElement: function(tag, props){
-		if (props && props.checked != null) props.defaultChecked = props.checked;
-		/*<ltIE8>*/// Fix for readonly name and type properties in IE < 8
-		if (createElementAcceptsHTML && props){
-			tag = '<' + tag;
-			if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"';
-			if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"';
-			tag += '>';
-			delete props.name;
-			delete props.type;
+		if (props){
+			if (props.checked != null) props.defaultChecked = props.checked;
+			if ((props.type == 'checkbox' || props.type == 'radio') && props.value == null) props.value = 'on';
+			/*<ltIE9>*/ // IE needs the type to be set before changing content of style element
+			if (!canChangeStyleHTML && tag == 'style'){
+				var styleElement = document.createElement('style');
+				styleElement.setAttribute('type', 'text/css');
+				if (props.type) delete props.type;
+				return this.id(styleElement).set(props);
+			}
+			/*</ltIE9>*/
+			/*<ltIE8>*/// Fix for readonly name and type properties in IE < 8
+			if (createElementAcceptsHTML){
+				tag = '<' + tag;
+				if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"';
+				if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"';
+				tag += '>';
+				delete props.name;
+				delete props.type;
+			}
+			/*</ltIE8>*/
 		}
-		/*</ltIE8>*/
 		return this.id(this.createElement(tag)).set(props);
 	}
 
@@ -3367,42 +3184,7 @@ var contains = {contains: function(element){
 if (!document.contains) Document.implement(contains);
 if (!document.createElement('div').contains) Element.implement(contains);
 
-//<1.2compat>
 
-Element.implement('hasChild', function(element){
-	return this !== element && this.contains(element);
-});
-
-(function(search, find, match){
-
-	this.Selectors = {};
-	var pseudos = this.Selectors.Pseudo = new Hash();
-
-	var addSlickPseudos = function(){
-		for (var name in pseudos) if (pseudos.hasOwnProperty(name)){
-			Slick.definePseudo(name, pseudos[name]);
-			delete pseudos[name];
-		}
-	};
-
-	Slick.search = function(context, expression, append){
-		addSlickPseudos();
-		return search.call(this, context, expression, append);
-	};
-
-	Slick.find = function(context, expression){
-		addSlickPseudos();
-		return find.call(this, context, expression);
-	};
-
-	Slick.match = function(node, selector){
-		addSlickPseudos();
-		return match.call(this, node, selector);
-	};
-
-})(Slick.search, Slick.find, Slick.match);
-
-//</1.2compat>
 
 // tree walking
 
@@ -3468,23 +3250,7 @@ Element.implement({
 
 });
 
-//<1.2compat>
 
-if (window.$$ == null) Window.implement('$$', function(selector){
-	var elements = new Elements;
-	if (arguments.length == 1 && typeof selector == 'string') return Slick.search(this.document, selector, elements);
-	var args = Array.flatten(arguments);
-	for (var i = 0, l = args.length; i < l; i++){
-		var item = args[i];
-		switch (typeOf(item)){
-			case 'element': elements.push(item); break;
-			case 'string': Slick.search(this.document, item, elements);
-		}
-	}
-	return elements;
-});
-
-//</1.2compat>
 
 if (window.$$ == null) Window.implement('$$', function(selector){
 	if (arguments.length == 1){
@@ -3520,29 +3286,7 @@ var inserters = {
 
 inserters.inside = inserters.bottom;
 
-//<1.2compat>
 
-Object.each(inserters, function(inserter, where){
-
-	where = where.capitalize();
-
-	var methods = {};
-
-	methods['inject' + where] = function(el){
-		inserter(this, document.id(el, true));
-		return this;
-	};
-
-	methods['grab' + where] = function(el){
-		inserter(document.id(el, true), this);
-		return this;
-	};
-
-	Element.implement(methods);
-
-});
-
-//</1.2compat>
 
 // getProperty / setProperty
 
@@ -3570,6 +3314,21 @@ Object.forEach(properties, function(real, key){
 	};
 });
 
+/*<ltIE9>*/
+propertySetters.text = (function(){
+	return function(node, value){
+		if (node.get('tag') == 'style') node.set('html', value);
+		else node[properties.text] = value;
+	};
+})(propertySetters.text);
+
+propertyGetters.text = (function(getter){
+	return function(node){
+		return (node.get('tag') == 'style') ? node.innerHTML : getter(node);
+	};
+})(propertyGetters.text);
+/*</ltIE9>*/
+
 // Booleans
 
 var bools = [
@@ -3620,7 +3379,7 @@ propertyGetters['class'] = function(node){
 /* <webkit> */
 var el = document.createElement('button');
 // IE sets type as readonly and throws
-try { el.type = 'button'; } catch(e){}
+try { el.type = 'button'; } catch (e){}
 if (el.type != 'button') propertySetters.type = function(node, value){
 	node.setAttribute('type', value);
 };
@@ -3628,15 +3387,43 @@ el = null;
 /* </webkit> */
 
 /*<IE>*/
-var input = document.createElement('input');
+
+/*<ltIE9>*/
+// #2479 - IE8 Cannot set HTML of style element
+var canChangeStyleHTML = (function(){
+	var div = document.createElement('style'),
+		flag = false;
+	try {
+		div.innerHTML = '#justTesing{margin: 0px;}';
+		flag = !!div.innerHTML;
+	} catch (e){}
+	return flag;
+})();
+/*</ltIE9>*/
+
+var input = document.createElement('input'), volatileInputValue, html5InputSupport;
+
+// #2178
 input.value = 't';
 input.type = 'submit';
-if (input.value != 't') propertySetters.type = function(node, type){
-	var value = node.value;
-	node.type = type;
-	node.value = value;
-};
+volatileInputValue = input.value != 't';
+
+// #2443 - IE throws "Invalid Argument" when trying to use html5 input types
+try {
+	input.value = '';
+	input.type = 'email';
+	html5InputSupport = input.type == 'email';
+} catch (e){}
+
 input = null;
+
+if (volatileInputValue || !html5InputSupport) propertySetters.type = function(node, type){
+	try {
+		var value = node.value;
+		node.type = type;
+		node.value = value;
+	} catch (e){}
+};
 /*</IE>*/
 
 /* getProperty, setProperty */
@@ -3647,7 +3434,28 @@ var pollutesGetAttribute = (function(div){
 	return (div.getAttribute('random') == 'attribute');
 })(document.createElement('div'));
 
-/* <ltIE9> */
+var hasCloneBug = (function(test){
+	test.innerHTML = '<object><param name="should_fix" value="the unknown" /></object>';
+	return test.cloneNode(true).firstChild.childNodes.length != 1;
+})(document.createElement('div'));
+/* </ltIE9> */
+
+var hasClassList = !!document.createElement('div').classList;
+
+var classes = function(className){
+	var classNames = (className || '').clean().split(' '), uniques = {};
+	return classNames.filter(function(className){
+		if (className !== '' && !uniques[className]) return uniques[className] = className;
+	});
+};
+
+var addToClassList = function(name){
+	this.classList.add(name);
+};
+
+var removeFromClassList = function(name){
+	this.classList.remove(name);
+};
 
 Element.implement({
 
@@ -3657,7 +3465,8 @@ Element.implement({
 			setter(this, value);
 		} else {
 			/* <ltIE9> */
-			if (pollutesGetAttribute) var attributeWhiteList = this.retrieve('$attributeWhiteList', {});
+			var attributeWhiteList;
+			if (pollutesGetAttribute) attributeWhiteList = this.retrieve('$attributeWhiteList', {});
 			/* </ltIE9> */
 
 			if (value == null){
@@ -3700,7 +3509,7 @@ Element.implement({
 	},
 
 	getProperties: function(){
-		var args = Array.from(arguments);
+		var args = Array.convert(arguments);
 		return args.map(this.getProperty, this).associate(args);
 	},
 
@@ -3729,17 +3538,27 @@ Element.implement({
 		return this;
 	},
 
-	hasClass: function(className){
-		return this.className.clean().contains(className, ' ');
+	hasClass: hasClassList ? function(className){
+		return this.classList.contains(className);
+	} : function(className){
+		return classes(this.className).contains(className);
 	},
 
-	addClass: function(className){
-		if (!this.hasClass(className)) this.className = (this.className + ' ' + className).clean();
+	addClass: hasClassList ? function(className){
+		classes(className).forEach(addToClassList, this);
+		return this;
+	} : function(className){
+		this.className = classes(className + ' ' + this.className).join(' ');
 		return this;
 	},
 
-	removeClass: function(className){
-		this.className = this.className.replace(new RegExp('(^|\\s)' + className + '(?:\\s|$)'), '$1');
+	removeClass: hasClassList ? function(className){
+		classes(className).forEach(removeFromClassList, this);
+		return this;
+	} : function(className){
+		var classNames = classes(this.className);
+		classes(className).forEach(classNames.erase, classNames);
+		this.className = classNames.join(' ');
 		return this;
 	},
 
@@ -3789,7 +3608,7 @@ Element.implement({
 
 	getSelected: function(){
 		this.selectedIndex; // Safari 3.2.1
-		return new Elements(Array.from(this.options).filter(function(option){
+		return new Elements(Array.convert(this.options).filter(function(option){
 			return option.selected;
 		}));
 	},
@@ -3805,7 +3624,7 @@ Element.implement({
 				return document.id(opt).get('value');
 			}) : ((type == 'radio' || type == 'checkbox') && !el.checked) ? null : el.get('value');
 
-			Array.from(value).each(function(val){
+			Array.convert(value).each(function(val){
 				if (typeof val != 'undefined') queryString.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(val));
 			});
 		});
@@ -3814,6 +3633,37 @@ Element.implement({
 
 });
 
+
+// appendHTML
+
+var appendInserters = {
+	before: 'beforeBegin',
+	after: 'afterEnd',
+	bottom: 'beforeEnd',
+	top: 'afterBegin',
+	inside: 'beforeEnd'
+};
+
+Element.implement('appendHTML', ('insertAdjacentHTML' in document.createElement('div')) ? function(html, where){
+	this.insertAdjacentHTML(appendInserters[where || 'bottom'], html);
+	return this;
+} : function(html, where){
+	var temp = new Element('div', {html: html}),
+		children = temp.childNodes,
+		fragment = temp.firstChild;
+
+	if (!fragment) return this;
+	if (children.length > 1){
+		fragment = document.createDocumentFragment();
+		for (var i = 0, l = children.length; i < l; i++){
+			fragment.appendChild(children[i]);
+		}
+	}
+
+	inserters[where || 'bottom'](fragment, this);
+	return this;
+});
+
 var collected = {}, storage = {};
 
 var get = function(uid){
@@ -3843,7 +3693,7 @@ Element.implement({
 	},
 
 	empty: function(){
-		Array.from(this.childNodes).each(Element.dispose);
+		Array.convert(this.childNodes).each(Element.dispose);
 		return this;
 	},
 
@@ -3856,8 +3706,8 @@ Element.implement({
 		var clone = this.cloneNode(contents), ce = [clone], te = [this], i;
 
 		if (contents){
-			ce.append(Array.from(clone.getElementsByTagName('*')));
-			te.append(Array.from(this.getElementsByTagName('*')));
+			ce.append(Array.convert(clone.getElementsByTagName('*')));
+			te.append(Array.convert(this.getElementsByTagName('*')));
 		}
 
 		for (i = ce.length; i--;){
@@ -3879,7 +3729,7 @@ Element.implement({
 		}
 
 		/*<ltIE9>*/
-		if (Browser.ie){
+		if (hasCloneBug){
 			var co = clone.getElementsByTagName('object'), to = this.getElementsByTagName('object');
 			for (i = co.length; i--;) co[i].outerHTML = to[i].outerHTML;
 		}
@@ -3892,13 +3742,7 @@ Element.implement({
 [Element, Window, Document].invoke('implement', {
 
 	addListener: function(type, fn){
-		if (type == 'unload'){
-			var old = fn, self = this;
-			fn = function(){
-				self.removeListener('unload', fn);
-				old();
-			};
-		} else {
+		if (window.attachEvent && !window.addEventListener){
 			collected[Slick.uidOf(this)] = this;
 		}
 		if (this.addEventListener) this.addEventListener(type, fn, !!arguments[2]);
@@ -3933,19 +3777,19 @@ Element.implement({
 });
 
 /*<ltIE9>*/
-if (window.attachEvent && !window.addEventListener) window.addListener('unload', function(){
-	Object.each(collected, clean);
-	if (window.CollectGarbage) CollectGarbage();
-});
+if (window.attachEvent && !window.addEventListener){
+	var gc = function(){
+		Object.each(collected, clean);
+		if (window.CollectGarbage) CollectGarbage();
+		window.removeListener('unload', gc);
+	};
+	window.addListener('unload', gc);
+}
 /*</ltIE9>*/
 
 Element.Properties = {};
 
-//<1.2compat>
 
-Element.Properties = new Hash;
-
-//</1.2compat>
 
 Element.Properties.style = {
 
@@ -3976,30 +3820,35 @@ Element.Properties.html = {
 	set: function(html){
 		if (html == null) html = '';
 		else if (typeOf(html) == 'array') html = html.join('');
-		this.innerHTML = html;
-	},
 
+		/*<ltIE9>*/
+		if (this.styleSheet && !canChangeStyleHTML) this.styleSheet.cssText = html;
+		else /*</ltIE9>*/this.innerHTML = html;
+	},
 	erase: function(){
-		this.innerHTML = '';
+		this.set('html', '');
 	}
 
 };
 
+var supportsHTML5Elements = true, supportsTableInnerHTML = true, supportsTRInnerHTML = true;
+
 /*<ltIE9>*/
 // technique by jdbarlett - http://jdbartlett.com/innershiv/
 var div = document.createElement('div');
+var fragment;
 div.innerHTML = '<nav></nav>';
-var supportsHTML5Elements = (div.childNodes.length == 1);
+supportsHTML5Elements = (div.childNodes.length == 1);
 if (!supportsHTML5Elements){
-	var tags = 'abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video'.split(' '),
-		fragment = document.createDocumentFragment(), l = tags.length;
+	var tags = 'abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video'.split(' ');
+	fragment = document.createDocumentFragment(), l = tags.length;
 	while (l--) fragment.createElement(tags[l]);
 }
 div = null;
 /*</ltIE9>*/
 
 /*<IE>*/
-var supportsTableInnerHTML = Function.attempt(function(){
+supportsTableInnerHTML = Function.attempt(function(){
 	var table = document.createElement('table');
 	table.innerHTML = '<tr><td></td></tr>';
 	return true;
@@ -4008,7 +3857,7 @@ var supportsTableInnerHTML = Function.attempt(function(){
 /*<ltFF4>*/
 var tr = document.createElement('tr'), html = '<td></td>';
 tr.innerHTML = html;
-var supportsTRInnerHTML = (tr.innerHTML == html);
+supportsTRInnerHTML = (tr.innerHTML == html);
 tr = null;
 /*</ltFF4>*/
 
@@ -4026,6 +3875,10 @@ if (!supportsTableInnerHTML || !supportsTRInnerHTML || !supportsHTML5Elements){
 		translations.thead = translations.tfoot = translations.tbody;
 
 		return function(html){
+
+			/*<ltIE9>*/
+			if (this.styleSheet) return set.call(this, html);
+			/*</ltIE9>*/
 			var wrap = translations[this.get('tag')];
 			if (!wrap && !supportsHTML5Elements) wrap = [0, '', ''];
 			if (!wrap) return set.call(this, html);
@@ -4053,11 +3906,12 @@ if (testForm.firstChild.value != 's') Element.Properties.value = {
 		var tag = this.get('tag');
 		if (tag != 'select') return this.setProperty('value', value);
 		var options = this.getElements('option');
+		value = String(value);
 		for (var i = 0; i < options.length; i++){
 			var option = options[i],
 				attr = option.getAttributeNode('value'),
 				optionValue = (attr && attr.specified) ? option.value : option.get('text');
-			if (optionValue == value) return option.selected = true;
+			if (optionValue === value) return option.selected = true;
 		}
 	},
 
@@ -4092,226 +3946,134 @@ if (document.createElement('div').getAttributeNode('id')) Element.Properties.id
 
 })();
 
-
 /*
 ---
 
-name: Element.Style
+name: Event
 
-description: Contains methods for interacting with the styles of Elements in a fashionable way.
+description: Contains the Event Type, to make the event object cross-browser.
 
 license: MIT-style license.
 
-requires: Element
+requires: [Window, Document, Array, Function, String, Object]
 
-provides: Element.Style
+provides: Event
 
 ...
 */
 
 (function(){
 
-var html = document.html;
-
-//<ltIE9>
-// Check for oldIE, which does not remove styles when they're set to null
-var el = document.createElement('div');
-el.style.color = 'red';
-el.style.color = null;
-var doesNotRemoveStyles = el.style.color == 'red';
-el = null;
-//</ltIE9>
-
-Element.Properties.styles = {set: function(styles){
-	this.setStyles(styles);
-}};
-
-var hasOpacity = (html.style.opacity != null),
-	hasFilter = (html.style.filter != null),
-	reAlpha = /alpha\(opacity=([\d.]+)\)/i;
-
-var setVisibility = function(element, opacity){
-	element.store('$opacity', opacity);
-	element.style.visibility = opacity > 0 || opacity == null ? 'visible' : 'hidden';
+var _keys = {};
+var normalizeWheelSpeed = function(event){
+	var normalized;
+	if (event.wheelDelta){
+		normalized = event.wheelDelta % 120 == 0 ? event.wheelDelta / 120 : event.wheelDelta / 12;
+	} else {
+		var rawAmount = event.deltaY || event.detail || 0;
+		normalized = -(rawAmount % 3 == 0 ? rawAmount / 3 : rawAmount * 10);
+	}
+	return normalized;
 };
 
-var setOpacity = (hasOpacity ? function(element, opacity){
-	element.style.opacity = opacity;
-} : (hasFilter ? function(element, opacity){
-	var style = element.style;
-	if (!element.currentStyle || !element.currentStyle.hasLayout) style.zoom = 1;
-	if (opacity == null || opacity == 1) opacity = '';
-	else opacity = 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')';
-	var filter = style.filter || element.getComputedStyle('filter') || '';
-	style.filter = reAlpha.test(filter) ? filter.replace(reAlpha, opacity) : filter + opacity;
-	if (!style.filter) style.removeAttribute('filter');
-} : setVisibility));
+var DOMEvent = this.DOMEvent = new Type('DOMEvent', function(event, win){
+	if (!win) win = window;
+	event = event || win.event;
+	if (event.$extended) return event;
+	this.event = event;
+	this.$extended = true;
+	this.shift = event.shiftKey;
+	this.control = event.ctrlKey;
+	this.alt = event.altKey;
+	this.meta = event.metaKey;
+	var type = this.type = event.type;
+	var target = event.target || event.srcElement;
+	while (target && target.nodeType == 3) target = target.parentNode;
+	this.target = document.id(target);
 
-var getOpacity = (hasOpacity ? function(element){
-	var opacity = element.style.opacity || element.getComputedStyle('opacity');
-	return (opacity == '') ? 1 : opacity.toFloat();
-} : (hasFilter ? function(element){
-	var filter = (element.style.filter || element.getComputedStyle('filter')),
-		opacity;
-	if (filter) opacity = filter.match(reAlpha);
-	return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
-} : function(element){
-	var opacity = element.retrieve('$opacity');
-	if (opacity == null) opacity = (element.style.visibility == 'hidden' ? 0 : 1);
-	return opacity;
-}));
+	if (type.indexOf('key') == 0){
+		var code = this.code = (event.which || event.keyCode);
+		if (!this.shift || type != 'keypress') this.key = _keys[code];
+		if (type == 'keydown' || type == 'keyup'){
+			if (code > 111 && code < 124) this.key = 'f' + (code - 111);
+			else if (code > 95 && code < 106) this.key = code - 96;
+		}
+		if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
+	} else if (type == 'click' || type == 'dblclick' || type == 'contextmenu' || type == 'wheel' || type == 'DOMMouseScroll' || type.indexOf('mouse') == 0){
+		var doc = win.document;
+		doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
+		this.page = {
+			x: (event.pageX != null) ? event.pageX : event.clientX + doc.scrollLeft,
+			y: (event.pageY != null) ? event.pageY : event.clientY + doc.scrollTop
+		};
+		this.client = {
+			x: (event.pageX != null) ? event.pageX - win.pageXOffset : event.clientX,
+			y: (event.pageY != null) ? event.pageY - win.pageYOffset : event.clientY
+		};
+		if (type == 'DOMMouseScroll' || type == 'wheel' || type == 'mousewheel') this.wheel = normalizeWheelSpeed(event);
+		this.rightClick = (event.which == 3 || event.button == 2);
+		if (type == 'mouseover' || type == 'mouseout' || type == 'mouseenter' || type == 'mouseleave'){
+			var overTarget = type == 'mouseover' || type == 'mouseenter';
+			var related = event.relatedTarget || event[(overTarget ? 'from' : 'to') + 'Element'];
+			while (related && related.nodeType == 3) related = related.parentNode;
+			this.relatedTarget = document.id(related);
+		}
+	} else if (type.indexOf('touch') == 0 || type.indexOf('gesture') == 0){
+		this.rotation = event.rotation;
+		this.scale = event.scale;
+		this.targetTouches = event.targetTouches;
+		this.changedTouches = event.changedTouches;
+		var touches = this.touches = event.touches;
+		if (touches && touches[0]){
+			var touch = touches[0];
+			this.page = {x: touch.pageX, y: touch.pageY};
+			this.client = {x: touch.clientX, y: touch.clientY};
+		}
+	}
 
-var floatName = (html.style.cssFloat == null) ? 'styleFloat' : 'cssFloat';
+	if (!this.client) this.client = {};
+	if (!this.page) this.page = {};
+});
 
-Element.implement({
+DOMEvent.implement({
 
-	getComputedStyle: function(property){
-		if (this.currentStyle) return this.currentStyle[property.camelCase()];
-		var defaultView = Element.getDocument(this).defaultView,
-			computed = defaultView ? defaultView.getComputedStyle(this, null) : null;
-		return (computed) ? computed.getPropertyValue((property == floatName) ? 'float' : property.hyphenate()) : null;
+	stop: function(){
+		return this.preventDefault().stopPropagation();
 	},
 
-	setStyle: function(property, value){
-		if (property == 'opacity'){
-			if (value != null) value = parseFloat(value);
-			setOpacity(this, value);
-			return this;
-		}
-		property = (property == 'float' ? floatName : property).camelCase();
-		if (typeOf(value) != 'string'){
-			var map = (Element.Styles[property] || '@').split(' ');
-			value = Array.from(value).map(function(val, i){
-				if (!map[i]) return '';
-				return (typeOf(val) == 'number') ? map[i].replace('@', Math.round(val)) : val;
-			}).join(' ');
-		} else if (value == String(Number(value))){
-			value = Math.round(value);
-		}
-		this.style[property] = value;
-		//<ltIE9>
-		if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
-			this.style.removeAttribute(property);
-		}
-		//</ltIE9>
+	stopPropagation: function(){
+		if (this.event.stopPropagation) this.event.stopPropagation();
+		else this.event.cancelBubble = true;
 		return this;
 	},
 
-	getStyle: function(property){
-		if (property == 'opacity') return getOpacity(this);
-		property = (property == 'float' ? floatName : property).camelCase();
-		var result = this.style[property];
-		if (!result || property == 'zIndex'){
-			result = [];
-			for (var style in Element.ShortStyles){
-				if (property != style) continue;
-				for (var s in Element.ShortStyles[style]) result.push(this.getStyle(s));
-				return result.join(' ');
-			}
-			result = this.getComputedStyle(property);
-		}
-		if (result){
-			result = String(result);
-			var color = result.match(/rgba?\([\d\s,]+\)/);
-			if (color) result = result.replace(color[0], color[0].rgbToHex());
-		}
-		if (Browser.opera || Browser.ie){
-			if ((/^(height|width)$/).test(property) && !(/px$/.test(result))){
-				var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0;
-				values.each(function(value){
-					size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt();
-				}, this);
-				return this['offset' + property.capitalize()] - size + 'px';
-			}
-			if (Browser.ie && (/^border(.+)Width|margin|padding/).test(property) && isNaN(parseFloat(result))){
-				return '0px';
-			}
-		}
-		return result;
-	},
-
-	setStyles: function(styles){
-		for (var style in styles) this.setStyle(style, styles[style]);
+	preventDefault: function(){
+		if (this.event.preventDefault) this.event.preventDefault();
+		else this.event.returnValue = false;
 		return this;
-	},
-
-	getStyles: function(){
-		var result = {};
-		Array.flatten(arguments).each(function(key){
-			result[key] = this.getStyle(key);
-		}, this);
-		return result;
 	}
 
 });
 
-Element.Styles = {
-	left: '@px', top: '@px', bottom: '@px', right: '@px',
-	width: '@px', height: '@px', maxWidth: '@px', maxHeight: '@px', minWidth: '@px', minHeight: '@px',
-	backgroundColor: 'rgb(@, @, @)', backgroundPosition: '@px @px', color: 'rgb(@, @, @)',
-	fontSize: '@px', letterSpacing: '@px', lineHeight: '@px', clip: 'rect(@px @px @px @px)',
-	margin: '@px @px @px @px', padding: '@px @px @px @px', border: '@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)',
-	borderWidth: '@px @px @px @px', borderStyle: '@ @ @ @', borderColor: 'rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)',
-	zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@'
+DOMEvent.defineKey = function(code, key){
+	_keys[code] = key;
+	return this;
 };
 
-//<1.3compat>
+DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
 
-Element.implement({
-
-	setOpacity: function(value){
-		setOpacity(this, value);
-		return this;
-	},
-
-	getOpacity: function(){
-		return getOpacity(this);
-	}
-
-});
-
-Element.Properties.opacity = {
-
-	set: function(opacity){
-		setOpacity(this, opacity);
-		setVisibility(this, opacity);
-	},
-
-	get: function(){
-		return getOpacity(this);
-	}
-
-};
-
-//</1.3compat>
-
-//<1.2compat>
-
-Element.Styles = new Hash(Element.Styles);
-
-//</1.2compat>
-
-Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}};
-
-['Top', 'Right', 'Bottom', 'Left'].each(function(direction){
-	var Short = Element.ShortStyles;
-	var All = Element.Styles;
-	['margin', 'padding'].each(function(style){
-		var sd = style + direction;
-		Short[style][sd] = All[sd] = '@px';
-	});
-	var bd = 'border' + direction;
-	Short.border[bd] = All[bd] = '@px @ rgb(@, @, @)';
-	var bdw = bd + 'Width', bds = bd + 'Style', bdc = bd + 'Color';
-	Short[bd] = {};
-	Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = '@px';
-	Short.borderStyle[bds] = Short[bd][bds] = All[bds] = '@';
-	Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)';
+DOMEvent.defineKeys({
+	'38': 'up', '40': 'down', '37': 'left', '39': 'right',
+	'27': 'esc', '32': 'space', '8': 'backspace', '9': 'tab',
+	'46': 'delete', '13': 'enter'
 });
 
 })();
 
 
+
+
+
 /*
 ---
 
@@ -4353,7 +4115,7 @@ Element.Properties.events = {set: function(events){
 					return true;
 				};
 			}
-			if (custom.base) realType = Function.from(custom.base).call(this, type);
+			if (custom.base) realType = Function.convert(custom.base).call(this, type);
 		}
 		var defn = function(){
 			return fn.call(self);
@@ -4384,7 +4146,7 @@ Element.Properties.events = {set: function(events){
 		var custom = Element.Events[type];
 		if (custom){
 			if (custom.onRemove) custom.onRemove.call(this, fn, type);
-			if (custom.base) type = Function.from(custom.base).call(this, type);
+			if (custom.base) type = Function.convert(custom.base).call(this, type);
 		}
 		return (Element.NativeEvents[type]) ? this.removeListener(type, value, arguments[2]) : this;
 	},
@@ -4417,7 +4179,7 @@ Element.Properties.events = {set: function(events){
 	fireEvent: function(type, args, delay){
 		var events = this.retrieve('events');
 		if (!events || !events[type]) return this;
-		args = Array.from(args);
+		args = Array.convert(args);
 
 		events[type].keys.each(function(fn){
 			if (delay) fn.delay(delay, this, args);
@@ -4444,7 +4206,7 @@ Element.Properties.events = {set: function(events){
 
 Element.NativeEvents = {
 	click: 2, dblclick: 2, mouseup: 2, mousedown: 2, contextmenu: 2, //mouse buttons
-	mousewheel: 2, DOMMouseScroll: 2, //mouse wheel
+	wheel: 2, mousewheel: 2, DOMMouseScroll: 2, //mouse wheel
 	mouseover: 2, mouseout: 2, mousemove: 2, selectstart: 2, selectend: 2, //mouse movement
 	keydown: 2, keypress: 2, keyup: 2, //keyboard
 	orientationchange: 2, // mobile
@@ -4452,23 +4214,27 @@ Element.NativeEvents = {
 	gesturestart: 2, gesturechange: 2, gestureend: 2, // gesture
 	focus: 2, blur: 2, change: 2, reset: 2, select: 2, submit: 2, paste: 2, input: 2, //form elements
 	load: 2, unload: 1, beforeunload: 2, resize: 1, move: 1, DOMContentLoaded: 1, readystatechange: 1, //window
-	error: 1, abort: 1, scroll: 1 //misc
+	hashchange: 1, popstate: 2, pageshow: 2, pagehide: 2, // history
+	error: 1, abort: 1, scroll: 1, message: 2 //misc
 };
 
-Element.Events = {mousewheel: {
-	base: (Browser.firefox) ? 'DOMMouseScroll' : 'mousewheel'
-}};
+Element.Events = {
+	mousewheel: {
+		base: 'onwheel' in document ? 'wheel' : 'onmousewheel' in document ? 'mousewheel' : 'DOMMouseScroll'
+	}
+};
+
+var check = function(event){
+	var related = event.relatedTarget;
+	if (related == null) return true;
+	if (!related) return false;
+	return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
+};
 
 if ('onmouseenter' in document.documentElement){
 	Element.NativeEvents.mouseenter = Element.NativeEvents.mouseleave = 2;
+	Element.MouseenterCheck = check;
 } else {
-	var check = function(event){
-		var related = event.relatedTarget;
-		if (related == null) return true;
-		if (!related) return false;
-		return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
-	};
-
 	Element.Events.mouseenter = {
 		base: 'mouseover',
 		condition: check
@@ -4486,24 +4252,19 @@ if (!window.addEventListener){
 	Element.Events.change = {
 		base: function(){
 			var type = this.type;
-			return (this.get('tag') == 'input' && (type == 'radio' || type == 'checkbox')) ? 'propertychange' : 'change'
+			return (this.get('tag') == 'input' && (type == 'radio' || type == 'checkbox')) ? 'propertychange' : 'change';
 		},
 		condition: function(event){
-			return this.type != 'radio' || (event.event.propertyName == 'checked' && this.checked);
+			return event.type != 'propertychange' || event.event.propertyName == 'checked';
 		}
-	}
+	};
 }
 /*</ltIE9>*/
 
-//<1.2compat>
 
-Element.Events = new Hash(Element.Events);
-
-//</1.2compat>
 
 })();
 
-
 /*
 ---
 
@@ -4535,10 +4296,12 @@ var bubbleUp = function(self, match, fn, event, target){
 
 var map = {
 	mouseenter: {
-		base: 'mouseover'
+		base: 'mouseover',
+		condition: Element.MouseenterCheck
 	},
 	mouseleave: {
-		base: 'mouseout'
+		base: 'mouseout',
+		condition: Element.MouseenterCheck
 	},
 	focus: {
 		base: 'focus' + (eventListenerSupport ? '' : 'in'),
@@ -4561,7 +4324,10 @@ var formObserver = function(type){
 		remove: function(self, uid){
 			var list = self.retrieve(_key + type + 'listeners', {})[uid];
 			if (list && list.forms) for (var i = list.forms.length; i--;){
-				list.forms[i].removeEvent(type, list.fns[i]);
+				// the form may have been destroyed, so it won't have the
+				// removeEvent method anymore. In that case the event was
+				// removed as well.
+				if (list.forms[i].removeEvent) list.forms[i].removeEvent(type, list.fns[i]);
 			}
 		},
 
@@ -4645,8 +4411,8 @@ var delegation = {
 		};
 
 		var elementEvent = Element.Events[_type];
-		if (elementEvent && elementEvent.condition){
-			var __match = match, condition = elementEvent.condition;
+		if (_map.condition || elementEvent && elementEvent.condition){
+			var __match = match, condition = _map.condition || elementEvent.condition;
 			match = function(target, event){
 				return __match(target, event) && condition.call(target, event, type);
 			};
@@ -4681,7 +4447,7 @@ var delegation = {
 			if (_map.remove) _map.remove(this, _uid);
 			delete stored[_uid];
 			storage[_type] = stored;
-			return removeEvent.call(this, type, delegator);
+			return removeEvent.call(this, type, delegator, _map.capture);
 		}
 
 		var __uid, s;
@@ -4704,6 +4470,242 @@ var delegation = {
 
 })();
 
+/*
+---
+
+name: Element.Style
+
+description: Contains methods for interacting with the styles of Elements in a fashionable way.
+
+license: MIT-style license.
+
+requires: Element
+
+provides: Element.Style
+
+...
+*/
+
+(function(){
+
+var html = document.html, el;
+
+//<ltIE9>
+// Check for oldIE, which does not remove styles when they're set to null
+el = document.createElement('div');
+el.style.color = 'red';
+el.style.color = null;
+var doesNotRemoveStyles = el.style.color == 'red';
+
+// check for oldIE, which returns border* shorthand styles in the wrong order (color-width-style instead of width-style-color)
+var border = '1px solid #123abc';
+el.style.border = border;
+var returnsBordersInWrongOrder = el.style.border != border;
+el = null;
+//</ltIE9>
+
+var hasGetComputedStyle = !!window.getComputedStyle,
+	supportBorderRadius = document.createElement('div').style.borderRadius != null;
+
+Element.Properties.styles = {set: function(styles){
+	this.setStyles(styles);
+}};
+
+var hasOpacity = (html.style.opacity != null),
+	hasFilter = (html.style.filter != null),
+	reAlpha = /alpha\(opacity=([\d.]+)\)/i;
+
+var setVisibility = function(element, opacity){
+	element.store('$opacity', opacity);
+	element.style.visibility = opacity > 0 || opacity == null ? 'visible' : 'hidden';
+};
+
+//<ltIE9>
+var setFilter = function(element, regexp, value){
+	var style = element.style,
+		filter = style.filter || element.getComputedStyle('filter') || '';
+	style.filter = (regexp.test(filter) ? filter.replace(regexp, value) : filter + ' ' + value).trim();
+	if (!style.filter) style.removeAttribute('filter');
+};
+//</ltIE9>
+
+var setOpacity = (hasOpacity ? function(element, opacity){
+	element.style.opacity = opacity;
+} : (hasFilter ? function(element, opacity){
+	if (!element.currentStyle || !element.currentStyle.hasLayout) element.style.zoom = 1;
+	if (opacity == null || opacity == 1){
+		setFilter(element, reAlpha, '');
+		if (opacity == 1 && getOpacity(element) != 1) setFilter(element, reAlpha, 'alpha(opacity=100)');
+	} else {
+		setFilter(element, reAlpha, 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')');
+	}
+} : setVisibility));
+
+var getOpacity = (hasOpacity ? function(element){
+	var opacity = element.style.opacity || element.getComputedStyle('opacity');
+	return (opacity == '') ? 1 : opacity.toFloat();
+} : (hasFilter ? function(element){
+	var filter = (element.style.filter || element.getComputedStyle('filter')),
+		opacity;
+	if (filter) opacity = filter.match(reAlpha);
+	return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
+} : function(element){
+	var opacity = element.retrieve('$opacity');
+	if (opacity == null) opacity = (element.style.visibility == 'hidden' ? 0 : 1);
+	return opacity;
+}));
+
+var floatName = (html.style.cssFloat == null) ? 'styleFloat' : 'cssFloat',
+	namedPositions = {left: '0%', top: '0%', center: '50%', right: '100%', bottom: '100%'},
+	hasBackgroundPositionXY = (html.style.backgroundPositionX != null),
+	prefixPattern = /^-(ms)-/;
+
+var camelCase = function(property){
+	return property.replace(prefixPattern, '$1-').camelCase();
+};
+
+//<ltIE9>
+var removeStyle = function(style, property){
+	if (property == 'backgroundPosition'){
+		style.removeAttribute(property + 'X');
+		property += 'Y';
+	}
+	style.removeAttribute(property);
+};
+//</ltIE9>
+
+Element.implement({
+
+	getComputedStyle: function(property){
+		if (!hasGetComputedStyle && this.currentStyle) return this.currentStyle[camelCase(property)];
+		var defaultView = Element.getDocument(this).defaultView,
+			computed = defaultView ? defaultView.getComputedStyle(this, null) : null;
+		return (computed) ? computed.getPropertyValue((property == floatName) ? 'float' : property.hyphenate()) : '';
+	},
+
+	setStyle: function(property, value){
+		if (property == 'opacity'){
+			if (value != null) value = parseFloat(value);
+			setOpacity(this, value);
+			return this;
+		}
+		property = camelCase(property == 'float' ? floatName : property);
+		if (typeOf(value) != 'string'){
+			var map = (Element.Styles[property] || '@').split(' ');
+			value = Array.convert(value).map(function(val, i){
+				if (!map[i]) return '';
+				return (typeOf(val) == 'number') ? map[i].replace('@', Math.round(val)) : val;
+			}).join(' ');
+		} else if (value == String(Number(value))){
+			value = Math.round(value);
+		}
+		this.style[property] = value;
+		//<ltIE9>
+		if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
+			removeStyle(this.style, property);
+		}
+		//</ltIE9>
+		return this;
+	},
+
+	getStyle: function(property){
+		if (property == 'opacity') return getOpacity(this);
+		property = camelCase(property == 'float' ? floatName : property);
+		if (supportBorderRadius && property.indexOf('borderRadius') != -1){
+			return ['borderTopLeftRadius', 'borderTopRightRadius', 'borderBottomRightRadius', 'borderBottomLeftRadius'].map(function(corner){
+				return this.style[corner] || '0px';
+			}, this).join(' ');
+		}
+		var result = this.style[property];
+		if (!result || property == 'zIndex'){
+			if (Element.ShortStyles.hasOwnProperty(property)){
+				result = [];
+				for (var s in Element.ShortStyles[property]) result.push(this.getStyle(s));
+				return result.join(' ');
+			}
+			result = this.getComputedStyle(property);
+		}
+		if (hasBackgroundPositionXY && /^backgroundPosition[XY]?$/.test(property)){
+			return result.replace(/(top|right|bottom|left)/g, function(position){
+				return namedPositions[position];
+			}) || '0px';
+		}
+		if (!result && property == 'backgroundPosition') return '0px 0px';
+		if (result){
+			result = String(result);
+			var color = result.match(/rgba?\([\d\s,]+\)/);
+			if (color) result = result.replace(color[0], color[0].rgbToHex());
+		}
+		if (!hasGetComputedStyle && !this.style[property]){
+			if ((/^(height|width)$/).test(property) && !(/px$/.test(result))){
+				var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0;
+				values.each(function(value){
+					size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt();
+				}, this);
+				return this['offset' + property.capitalize()] - size + 'px';
+			}
+			if ((/^border(.+)Width|margin|padding/).test(property) && isNaN(parseFloat(result))){
+				return '0px';
+			}
+		}
+		//<ltIE9>
+		if (returnsBordersInWrongOrder && /^border(Top|Right|Bottom|Left)?$/.test(property) && /^#/.test(result)){
+			return result.replace(/^(.+)\s(.+)\s(.+)$/, '$2 $3 $1');
+		}
+		//</ltIE9>
+
+		return result;
+	},
+
+	setStyles: function(styles){
+		for (var style in styles) this.setStyle(style, styles[style]);
+		return this;
+	},
+
+	getStyles: function(){
+		var result = {};
+		Array.flatten(arguments).each(function(key){
+			result[key] = this.getStyle(key);
+		}, this);
+		return result;
+	}
+
+});
+
+Element.Styles = {
+	left: '@px', top: '@px', bottom: '@px', right: '@px',
+	width: '@px', height: '@px', maxWidth: '@px', maxHeight: '@px', minWidth: '@px', minHeight: '@px',
+	backgroundColor: 'rgb(@, @, @)', backgroundSize: '@px', backgroundPosition: '@px @px', color: 'rgb(@, @, @)',
+	fontSize: '@px', letterSpacing: '@px', lineHeight: '@px', clip: 'rect(@px @px @px @px)',
+	margin: '@px @px @px @px', padding: '@px @px @px @px', border: '@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)',
+	borderWidth: '@px @px @px @px', borderStyle: '@ @ @ @', borderColor: 'rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)',
+	zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@', borderRadius: '@px @px @px @px'
+};
+
+
+
+
+
+Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}};
+
+['Top', 'Right', 'Bottom', 'Left'].each(function(direction){
+	var Short = Element.ShortStyles;
+	var All = Element.Styles;
+	['margin', 'padding'].each(function(style){
+		var sd = style + direction;
+		Short[style][sd] = All[sd] = '@px';
+	});
+	var bd = 'border' + direction;
+	Short.border[bd] = All[bd] = '@px @ rgb(@, @, @)';
+	var bdw = bd + 'Width', bds = bd + 'Style', bdc = bd + 'Color';
+	Short[bd] = {};
+	Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = '@px';
+	Short.borderStyle[bds] = Short[bd][bds] = All[bds] = '@';
+	Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)';
+});
+
+if (hasBackgroundPositionXY) Element.ShortStyles.backgroundPosition = {backgroundPositionX: '@', backgroundPositionY: '@'};
+})();
 
 /*
 ---
@@ -4734,6 +4736,23 @@ element.appendChild(child);
 var brokenOffsetParent = (child.offsetParent === element);
 element = child = null;
 
+var heightComponents = ['height', 'paddingTop', 'paddingBottom', 'borderTopWidth', 'borderBottomWidth'],
+	widthComponents = ['width', 'paddingLeft', 'paddingRight', 'borderLeftWidth', 'borderRightWidth'];
+
+var svgCalculateSize = function(el){
+
+	var gCS = window.getComputedStyle(el),
+		bounds = {x: 0, y: 0};
+
+	heightComponents.each(function(css){
+		bounds.y += parseFloat(gCS[css]);
+	});
+	widthComponents.each(function(css){
+		bounds.x += parseFloat(gCS[css]);
+	});
+	return bounds;
+};
+
 var isOffset = function(el){
 	return styleString(el, 'position') != 'static' || isBody(el);
 };
@@ -4756,7 +4775,22 @@ Element.implement({
 
 	getSize: function(){
 		if (isBody(this)) return this.getWindow().getSize();
-		return {x: this.offsetWidth, y: this.offsetHeight};
+
+		//<ltIE9>
+		// This if clause is because IE8- cannot calculate getBoundingClientRect of elements with visibility hidden.
+		if (!window.getComputedStyle) return {x: this.offsetWidth, y: this.offsetHeight};
+		//</ltIE9>
+
+		// This svg section under, calling `svgCalculateSize()`, can be removed when FF fixed the svg size bug.
+		// Bug info: https://bugzilla.mozilla.org/show_bug.cgi?id=530985
+		if (this.get('tag') == 'svg') return svgCalculateSize(this);
+
+		try {
+			var bounds = this.getBoundingClientRect();
+			return {x: bounds.width, y: bounds.height};
+		} catch (e){
+			return {x: 0, y: 0};
+		}
 	},
 
 	getScrollSize: function(){
@@ -4794,12 +4828,14 @@ Element.implement({
 
 		try {
 			return element.offsetParent;
-		} catch(e) {}
+		} catch (e){}
 		return null;
 	},
 
 	getOffsets: function(){
-		if (this.getBoundingClientRect && !Browser.Platform.ios){
+		var hasGetBoundingClientRect = this.getBoundingClientRect;
+
+		if (hasGetBoundingClientRect){
 			var bound = this.getBoundingClientRect(),
 				html = document.id(this.getDocument().documentElement),
 				htmlScroll = html.getScroll(),
@@ -4807,8 +4843,8 @@ Element.implement({
 				isFixed = (styleString(this, 'position') == 'fixed');
 
 			return {
-				x: bound.left.toInt() + elemScrolls.x + ((isFixed) ? 0 : htmlScroll.x) - html.clientLeft,
-				y: bound.top.toInt()  + elemScrolls.y + ((isFixed) ? 0 : htmlScroll.y) - html.clientTop
+				x: bound.left.toFloat() + elemScrolls.x + ((isFixed) ? 0 : htmlScroll.x) - html.clientLeft,
+				y: bound.top.toFloat() + elemScrolls.y + ((isFixed) ? 0 : htmlScroll.y) - html.clientTop
 			};
 		}
 
@@ -4819,27 +4855,9 @@ Element.implement({
 			position.x += element.offsetLeft;
 			position.y += element.offsetTop;
 
-			if (Browser.firefox){
-				if (!borderBox(element)){
-					position.x += leftBorder(element);
-					position.y += topBorder(element);
-				}
-				var parent = element.parentNode;
-				if (parent && styleString(parent, 'overflow') != 'visible'){
-					position.x += leftBorder(parent);
-					position.y += topBorder(parent);
-				}
-			} else if (element != this && Browser.safari){
-				position.x += leftBorder(element);
-				position.y += topBorder(element);
-			}
-
 			element = element.offsetParent;
 		}
-		if (Browser.firefox && !borderBox(this)){
-			position.x -= leftBorder(this);
-			position.y -= topBorder(this);
-		}
+
 		return position;
 	},
 
@@ -4926,9 +4944,7 @@ function styleNumber(element, style){
 	return styleString(element, style).toInt() || 0;
 }
 
-function borderBox(element){
-	return styleString(element, '-moz-box-sizing') == 'border-box';
-}
+
 
 function topBorder(element){
 	return styleNumber(element, 'border-top-width');
@@ -4988,7 +5004,6 @@ Element.alias({position: 'setPosition'}); //compatability
 
 });
 
-
 /*
 ---
 
@@ -4998,7 +5013,7 @@ description: Contains the basic animation logic to be extended by all other Fx C
 
 license: MIT-style license.
 
-requires: [Chain, Events, Options]
+requires: [Chain, Events, Options, Class.Thenable]
 
 provides: Fx
 
@@ -5009,7 +5024,7 @@ provides: Fx
 
 var Fx = this.Fx = new Class({
 
-	Implements: [Chain, Events, Options],
+	Implements: [Chain, Events, Options, Class.Thenable],
 
 	options: {
 		/*
@@ -5083,6 +5098,9 @@ var Fx = this.Fx = new Class({
 		this.duration = Fx.Durations[duration] || duration.toInt();
 		this.frameInterval = 1000 / fps;
 		this.frames = frames || Math.round(this.duration / this.frameInterval);
+		if (this.getThenableState() !== 'pending'){
+			this.resetThenable(this.subject);
+		}
 		this.fireEvent('start', this.subject);
 		pushInstance.call(this, fps);
 		return this;
@@ -5098,6 +5116,7 @@ var Fx = this.Fx = new Class({
 			} else {
 				this.fireEvent('stop', this.subject);
 			}
+			this.resolve(this.subject === this ? null : this.subject);
 		}
 		return this;
 	},
@@ -5108,6 +5127,7 @@ var Fx = this.Fx = new Class({
 			pullInstance.call(this, this.options.fps);
 			this.frame = this.frames;
 			this.fireEvent('cancel', this.subject).clearChain();
+			this.reject(this.subject);
 		}
 		return this;
 	},
@@ -5121,13 +5141,17 @@ var Fx = this.Fx = new Class({
 	},
 
 	resume: function(){
-		if ((this.frame < this.frames) && !this.isRunning()) pushInstance.call(this, this.options.fps);
+		if (this.isPaused()) pushInstance.call(this, this.options.fps);
 		return this;
 	},
 
 	isRunning: function(){
 		var list = instances[this.options.fps];
 		return list && list.contains(this);
+	},
+
+	isPaused: function(){
+		return (this.frame < this.frames) && !this.isRunning();
 	}
 
 });
@@ -5169,7 +5193,6 @@ var pullInstance = function(fps){
 
 })();
 
-
 /*
 ---
 
@@ -5193,14 +5216,14 @@ Fx.CSS = new Class({
 	//prepares the base from/to object
 
 	prepare: function(element, property, values){
-		values = Array.from(values);
+		values = Array.convert(values);
 		var from = values[0], to = values[1];
 		if (to == null){
 			to = from;
 			from = element.getStyle(property);
 			var unit = this.options.unit;
 			// adapted from: https://github.com/ryanmorr/fx/blob/master/fx.js#L299
-			if (unit && from.slice(-unit.length) != unit && parseFloat(from) != 0){
+			if (unit && from && typeof from == 'string' && from.slice(-unit.length) != unit && parseFloat(from) != 0){
 				element.setStyle(property, to + unit);
 				var value = element.getComputedStyle(property);
 				// IE and Opera support pixelLeft or pixelWidth
@@ -5224,12 +5247,12 @@ Fx.CSS = new Class({
 	//parses a value into an array
 
 	parse: function(value){
-		value = Function.from(value)();
-		value = (typeof value == 'string') ? value.split(' ') : Array.from(value);
+		value = Function.convert(value)();
+		value = (typeof value == 'string') ? value.split(' ') : Array.convert(value);
 		return value.map(function(val){
 			val = String(val);
 			var found = false;
-			Object.each(Fx.CSS.Parsers, function(parser, key){
+			Object.each(Fx.CSS.Parsers, function(parser){
 				if (found) return;
 				var parsed = parser.parse(val);
 				if (parsed || parsed === 0) found = {value: parsed, parser: parser};
@@ -5246,7 +5269,7 @@ Fx.CSS = new Class({
 		(Math.min(from.length, to.length)).times(function(i){
 			computed.push({value: from[i].parser.compute(from[i].value, to[i].value, delta), parser: from[i].parser});
 		});
-		computed.$family = Function.from('fx:css:value');
+		computed.$family = Function.convert('fx:css:value');
 		return computed;
 	},
 
@@ -5272,11 +5295,13 @@ Fx.CSS = new Class({
 	search: function(selector){
 		if (Fx.CSS.Cache[selector]) return Fx.CSS.Cache[selector];
 		var to = {}, selectorTest = new RegExp('^' + selector.escapeRegExp() + '$');
-		Array.each(document.styleSheets, function(sheet, j){
-			var href = sheet.href;
-			if (href && href.contains('://') && !href.contains(document.domain)) return;
-			var rules = sheet.rules || sheet.cssRules;
-			Array.each(rules, function(rule, i){
+
+		var searchStyles = function(rules){
+			Array.each(rules, function(rule){
+				if (rule.media){
+					searchStyles(rule.rules || rule.cssRules);
+					return;
+				}
 				if (!rule.style) return;
 				var selectorText = (rule.selectorText) ? rule.selectorText.replace(/^\w+/, function(m){
 					return m.toLowerCase();
@@ -5288,6 +5313,13 @@ Fx.CSS = new Class({
 					to[style] = ((/^rgb/).test(value)) ? value.rgbToHex() : value;
 				});
 			});
+		};
+
+		Array.each(document.styleSheets, function(sheet){
+			var href = sheet.href;
+			if (href && href.indexOf('://') > -1 && href.indexOf(document.domain) == -1) return;
+			var rules = sheet.rules || sheet.cssRules;
+			searchStyles(rules);
 		});
 		return Fx.CSS.Cache[selector] = to;
 	}
@@ -5322,7 +5354,7 @@ Fx.CSS.Parsers = {
 	},
 
 	String: {
-		parse: Function.from(false),
+		parse: Function.convert(false),
 		compute: function(zero, one){
 			return one;
 		},
@@ -5333,124 +5365,6 @@ Fx.CSS.Parsers = {
 
 };
 
-//<1.2compat>
-
-Fx.CSS.Parsers = new Hash(Fx.CSS.Parsers);
-
-//</1.2compat>
-
-
-/*
----
-
-name: Fx.Tween
-
-description: Formerly Fx.Style, effect to transition any CSS property for an element.
-
-license: MIT-style license.
-
-requires: Fx.CSS
-
-provides: [Fx.Tween, Element.fade, Element.highlight]
-
-...
-*/
-
-Fx.Tween = new Class({
-
-	Extends: Fx.CSS,
-
-	initialize: function(element, options){
-		this.element = this.subject = document.id(element);
-		this.parent(options);
-	},
-
-	set: function(property, now){
-		if (arguments.length == 1){
-			now = property;
-			property = this.property || this.options.property;
-		}
-		this.render(this.element, property, now, this.options.unit);
-		return this;
-	},
-
-	start: function(property, from, to){
-		if (!this.check(property, from, to)) return this;
-		var args = Array.flatten(arguments);
-		this.property = this.options.property || args.shift();
-		var parsed = this.prepare(this.element, this.property, args);
-		return this.parent(parsed.from, parsed.to);
-	}
-
-});
-
-Element.Properties.tween = {
-
-	set: function(options){
-		this.get('tween').cancel().setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var tween = this.retrieve('tween');
-		if (!tween){
-			tween = new Fx.Tween(this, {link: 'cancel'});
-			this.store('tween', tween);
-		}
-		return tween;
-	}
-
-};
-
-Element.implement({
-
-	tween: function(property, from, to){
-		this.get('tween').start(property, from, to);
-		return this;
-	},
-
-	fade: function(how){
-		var fade = this.get('tween'), method, args = ['opacity'].append(arguments), toggle;
-		if (args[1] == null) args[1] = 'toggle';
-		switch (args[1]){
-			case 'in': method = 'start'; args[1] = 1; break;
-			case 'out': method = 'start'; args[1] = 0; break;
-			case 'show': method = 'set'; args[1] = 1; break;
-			case 'hide': method = 'set'; args[1] = 0; break;
-			case 'toggle':
-				var flag = this.retrieve('fade:flag', this.getStyle('opacity') == 1);
-				method = 'start';
-				args[1] = flag ? 0 : 1;
-				this.store('fade:flag', !flag);
-				toggle = true;
-			break;
-			default: method = 'start';
-		}
-		if (!toggle) this.eliminate('fade:flag');
-		fade[method].apply(fade, args);
-		var to = args[args.length - 1];
-		if (method == 'set' || to != 0) this.setStyle('visibility', to == 0 ? 'hidden' : 'visible');
-		else fade.chain(function(){
-			this.element.setStyle('visibility', 'hidden');
-			this.callChain();
-		});
-		return this;
-	},
-
-	highlight: function(start, end){
-		if (!end){
-			end = this.retrieve('highlight:original', this.getStyle('background-color'));
-			end = (end == 'transparent') ? '#fff' : end;
-		}
-		var tween = this.get('tween');
-		tween.start('background-color', start || '#ffff88', end).chain(function(){
-			this.setStyle('background-color', this.retrieve('highlight:original'));
-			tween.callChain();
-		}.bind(this));
-		return this;
-	}
-
-});
 
 
 /*
@@ -5531,7 +5445,6 @@ Element.implement({
 
 });
 
-
 /*
 ---
 
@@ -5567,7 +5480,7 @@ Fx.implement({
 });
 
 Fx.Transition = function(transition, params){
-	params = Array.from(params);
+	params = Array.convert(params);
 	var easeIn = function(pos){
 		return transition(pos, params);
 	};
@@ -5590,11 +5503,7 @@ Fx.Transitions = {
 
 };
 
-//<1.2compat>
 
-Fx.Transitions = new Hash(Fx.Transitions);
-
-//</1.2compat>
 
 Fx.Transitions.extend = function(transitions){
 	for (var transition in transitions) Fx.Transitions[transition] = new Fx.Transition(transitions[transition]);
@@ -5646,6 +5555,132 @@ Fx.Transitions.extend({
 	});
 });
 
+/*
+---
+
+name: Fx.Tween
+
+description: Formerly Fx.Style, effect to transition any CSS property for an element.
+
+license: MIT-style license.
+
+requires: Fx.CSS
+
+provides: [Fx.Tween, Element.fade, Element.highlight]
+
+...
+*/
+
+Fx.Tween = new Class({
+
+	Extends: Fx.CSS,
+
+	initialize: function(element, options){
+		this.element = this.subject = document.id(element);
+		this.parent(options);
+	},
+
+	set: function(property, now){
+		if (arguments.length == 1){
+			now = property;
+			property = this.property || this.options.property;
+		}
+		this.render(this.element, property, now, this.options.unit);
+		return this;
+	},
+
+	start: function(property, from, to){
+		if (!this.check(property, from, to)) return this;
+		var args = Array.flatten(arguments);
+		this.property = this.options.property || args.shift();
+		var parsed = this.prepare(this.element, this.property, args);
+		return this.parent(parsed.from, parsed.to);
+	}
+
+});
+
+Element.Properties.tween = {
+
+	set: function(options){
+		this.get('tween').cancel().setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var tween = this.retrieve('tween');
+		if (!tween){
+			tween = new Fx.Tween(this, {link: 'cancel'});
+			this.store('tween', tween);
+		}
+		return tween;
+	}
+
+};
+
+Element.implement({
+
+	tween: function(property, from, to){
+		this.get('tween').start(property, from, to);
+		return this;
+	},
+
+	fade: function(){
+		var fade = this.get('tween'), method, args = ['opacity'].append(arguments), toggle;
+		if (args[1] == null) args[1] = 'toggle';
+		switch (args[1]){
+			case 'in': method = 'start'; args[1] = 1; break;
+			case 'out': method = 'start'; args[1] = 0; break;
+			case 'show': method = 'set'; args[1] = 1; break;
+			case 'hide': method = 'set'; args[1] = 0; break;
+			case 'toggle':
+				var flag = this.retrieve('fade:flag', this.getStyle('opacity') == 1);
+				method = 'start';
+				args[1] = flag ? 0 : 1;
+				this.store('fade:flag', !flag);
+				toggle = true;
+				break;
+			default: method = 'start';
+		}
+		if (!toggle) this.eliminate('fade:flag');
+		fade[method].apply(fade, args);
+		var to = args[args.length - 1];
+
+		if (method == 'set'){
+			this.setStyle('visibility', to == 0 ? 'hidden' : 'visible');
+		} else if (to != 0){
+			if (fade.$chain.length){
+				fade.chain(function(){
+					this.element.setStyle('visibility', 'visible');
+					this.callChain();
+				});
+			} else {
+				this.setStyle('visibility', 'visible');
+			}
+		} else {
+			fade.chain(function(){
+				if (this.element.getStyle('opacity')) return;
+				this.element.setStyle('visibility', 'hidden');
+				this.callChain();
+			});
+		}
+
+		return this;
+	},
+
+	highlight: function(start, end){
+		if (!end){
+			end = this.retrieve('highlight:original', this.getStyle('background-color'));
+			end = (end == 'transparent') ? '#fff' : end;
+		}
+		var tween = this.get('tween');
+		tween.start('background-color', start || '#ffff88', end).chain(function(){
+			this.setStyle('background-color', this.retrieve('highlight:original'));
+			tween.callChain();
+		}.bind(this));
+		return this;
+	}
+
+});
 
 /*
 ---
@@ -5656,7 +5691,7 @@ description: Powerful all purpose Request Class. Uses XMLHTTPRequest.
 
 license: MIT-style license.
 
-requires: [Object, Element, Chain, Events, Options, Browser]
+requires: [Object, Element, Chain, Events, Options, Class.Thenable, Browser]
 
 provides: Request
 
@@ -5670,7 +5705,7 @@ var empty = function(){},
 
 var Request = this.Request = new Class({
 
-	Implements: [Chain, Events, Options],
+	Implements: [Chain, Events, Options, Class.Thenable],
 
 	options: {/*
 		onRequest: function(){},
@@ -5683,7 +5718,8 @@ var Request = this.Request = new Class({
 		onException: function(headerName, value){},
 		onTimeout: function(){},
 		user: '',
-		password: '',*/
+		password: '',
+		withCredentials: false,*/
 		url: '',
 		data: '',
 		headers: {
@@ -5721,7 +5757,10 @@ var Request = this.Request = new Class({
 		}.bind(this));
 		xhr.onreadystatechange = empty;
 		if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
-		clearTimeout(this.timer);
+		if (this.timer){
+			clearTimeout(this.timer);
+			delete this.timer;
+		}
 
 		this.response = {text: this.xhr.responseText || '', xml: this.xhr.responseXML};
 		if (this.options.isSuccess.call(this, this.status))
@@ -5746,6 +5785,7 @@ var Request = this.Request = new Class({
 
 	success: function(text, xml){
 		this.onSuccess(this.processScripts(text), xml);
+		this.resolve({text: text, xml: xml});
 	},
 
 	onSuccess: function(){
@@ -5754,6 +5794,7 @@ var Request = this.Request = new Class({
 
 	failure: function(){
 		this.onFailure();
+		this.reject({reason: 'failure', xhr: this.xhr});
 	},
 
 	onFailure: function(){
@@ -5770,6 +5811,7 @@ var Request = this.Request = new Class({
 
 	timeout: function(){
 		this.fireEvent('timeout', this.xhr);
+		this.reject({reason: 'timeout', xhr: this.xhr});
 	},
 
 	setHeader: function(name, value){
@@ -5832,10 +5874,10 @@ var Request = this.Request = new Class({
 		if (trimPosition > -1 && (trimPosition = url.indexOf('#')) > -1) url = url.substr(0, trimPosition);
 
 		if (this.options.noCache)
-			url += (url.contains('?') ? '&' : '?') + String.uniqueID();
+			url += (url.indexOf('?') > -1 ? '&' : '?') + String.uniqueID();
 
-		if (data && method == 'get'){
-			url += (url.contains('?') ? '&' : '?') + data;
+		if (data && (method == 'get' || method == 'delete')){
+			url += (url.indexOf('?') > -1 ? '&' : '?') + data;
 			data = null;
 		}
 
@@ -5846,7 +5888,7 @@ var Request = this.Request = new Class({
 		}
 
 		xhr.open(method.toUpperCase(), url, this.options.async, this.options.user, this.options.password);
-		if (this.options.user && 'withCredentials' in xhr) xhr.withCredentials = true;
+		if ((this.options.withCredentials) && 'withCredentials' in xhr) xhr.withCredentials = true;
 
 		xhr.onreadystatechange = this.onStateChange.bind(this);
 
@@ -5855,9 +5897,13 @@ var Request = this.Request = new Class({
 				xhr.setRequestHeader(key, value);
 			} catch (e){
 				this.fireEvent('exception', [key, value]);
+				this.reject({reason: 'exception', xhr: xhr, exception: e});
 			}
 		}, this);
 
+		if (this.getThenableState() !== 'pending'){
+			this.resetThenable({reason: 'send'});
+		}
 		this.fireEvent('request');
 		xhr.send(data);
 		if (!this.options.async) this.onStateChange();
@@ -5870,18 +5916,22 @@ var Request = this.Request = new Class({
 		this.running = false;
 		var xhr = this.xhr;
 		xhr.abort();
-		clearTimeout(this.timer);
+		if (this.timer){
+			clearTimeout(this.timer);
+			delete this.timer;
+		}
 		xhr.onreadystatechange = empty;
 		if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
 		this.xhr = new Browser.Request();
 		this.fireEvent('cancel');
+		this.reject({reason: 'cancel', xhr: xhr});
 		return this;
 	}
 
 });
 
 var methods = {};
-['get', 'post', 'put', 'delete', 'GET', 'POST', 'PUT', 'DELETE'].each(function(method){
+['get', 'post', 'put', 'delete', 'patch', 'head', 'GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'].each(function(method){
 	methods[method] = function(data){
 		var object = {
 			method: method
@@ -5926,7 +5976,6 @@ Element.implement({
 
 })();
 
-
 /*
 ---
 
@@ -5984,6 +6033,7 @@ Request.HTML = new Class({
 		if (options.evalScripts) Browser.exec(response.javascript);
 
 		this.onSuccess(response.tree, response.elements, response.html, response.javascript);
+		this.resolve({tree: response.tree, elements: response.elements, html: response.html, javascript: response.javascript});
 	}
 
 });
@@ -6016,7 +6066,6 @@ Element.implement({
 
 });
 
-
 /*
 ---
 
@@ -6037,14 +6086,7 @@ provides: JSON
 
 if (typeof JSON == 'undefined') this.JSON = {};
 
-//<1.2compat>
 
-JSON = new Hash({
-	stringify: JSON.stringify,
-	parse: JSON.parse
-});
-
-//</1.2compat>
 
 (function(){
 
@@ -6086,10 +6128,14 @@ JSON.encode = JSON.stringify ? function(obj){
 	return null;
 };
 
+JSON.secure = true;
+
+
 JSON.decode = function(string, secure){
 	if (!string || typeOf(string) != 'string') return null;
 
-	if (secure || JSON.secure){
+	if (secure == null) secure = JSON.secure;
+	if (secure){
 		if (JSON.parse) return JSON.parse(string);
 		if (!JSON.validate(string)) throw new Error('JSON could not decode the input; security is enabled and the value is not secure.');
 	}
@@ -6099,7 +6145,6 @@ JSON.decode = function(string, secure){
 
 })();
 
-
 /*
 ---
 
@@ -6141,13 +6186,16 @@ Request.JSON = new Class({
 			this.fireEvent('error', [text, error]);
 			return;
 		}
-		if (json == null) this.onFailure();
-		else this.onSuccess(json, text);
+		if (json == null){
+			this.failure();
+		} else {
+			this.onSuccess(json, text);
+			this.resolve({json: json, text: text});
+		}
 	}
 
 });
 
-
 /*
 ---
 
@@ -6177,7 +6225,8 @@ var Cookie = new Class({
 		duration: false,
 		secure: false,
 		document: document,
-		encode: true
+		encode: true,
+		httpOnly: false
 	},
 
 	initialize: function(key, options){
@@ -6195,6 +6244,7 @@ var Cookie = new Class({
 			value += '; expires=' + date.toGMTString();
 		}
 		if (this.options.secure) value += '; secure';
+		if (this.options.httpOnly) value += '; HttpOnly';
 		this.options.document.cookie = this.key + '=' + value;
 		return this;
 	},
@@ -6223,7 +6273,6 @@ Cookie.dispose = function(key, options){
 	return new Cookie(key, options).dispose();
 };
 
-
 /*
 ---
 
@@ -6251,12 +6300,14 @@ var ready,
 
 var domready = function(){
 	clearTimeout(timer);
-	if (ready) return;
-	Browser.loaded = ready = true;
-	document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
-
-	document.fireEvent('domready');
-	window.fireEvent('domready');
+	if (!ready){
+		Browser.loaded = ready = true;
+		document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
+		document.fireEvent('domready');
+		window.fireEvent('domready');
+	}
+	// cleanup scope vars
+	document = window = testElement = null;
 };
 
 var check = function(){
@@ -6329,119 +6380,3 @@ window.addEvent('load', function(){
 });
 
 })(window, document);
-
-
-/*
----
-
-name: Swiff
-
-description: Wrapper for embedding SWF movies. Supports External Interface Communication.
-
-license: MIT-style license.
-
-credits:
-  - Flash detection & Internet Explorer + Flash Player 9 fix inspired by SWFObject.
-
-requires: [Options, Object, Element]
-
-provides: Swiff
-
-...
-*/
-
-(function(){
-
-var Swiff = this.Swiff = new Class({
-
-	Implements: Options,
-
-	options: {
-		id: null,
-		height: 1,
-		width: 1,
-		container: null,
-		properties: {},
-		params: {
-			quality: 'high',
-			allowScriptAccess: 'always',
-			wMode: 'window',
-			swLiveConnect: true
-		},
-		callBacks: {},
-		vars: {}
-	},
-
-	toElement: function(){
-		return this.object;
-	},
-
-	initialize: function(path, options){
-		this.instance = 'Swiff_' + String.uniqueID();
-
-		this.setOptions(options);
-		options = this.options;
-		var id = this.id = options.id || this.instance;
-		var container = document.id(options.container);
-
-		Swiff.CallBacks[this.instance] = {};
-
-		var params = options.params, vars = options.vars, callBacks = options.callBacks;
-		var properties = Object.append({height: options.height, width: options.width}, options.properties);
-
-		var self = this;
-
-		for (var callBack in callBacks){
-			Swiff.CallBacks[this.instance][callBack] = (function(option){
-				return function(){
-					return option.apply(self.object, arguments);
-				};
-			})(callBacks[callBack]);
-			vars[callBack] = 'Swiff.CallBacks.' + this.instance + '.' + callBack;
-		}
-
-		params.flashVars = Object.toQueryString(vars);
-		if (Browser.ie){
-			properties.classid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
-			params.movie = path;
-		} else {
-			properties.type = 'application/x-shockwave-flash';
-		}
-		properties.data = path;
-
-		var build = '<object id="' + id + '"';
-		for (var property in properties) build += ' ' + property + '="' + properties[property] + '"';
-		build += '>';
-		for (var param in params){
-			if (params[param]) build += '<param name="' + param + '" value="' + params[param] + '" />';
-		}
-		build += '</object>';
-		this.object = ((container) ? container.empty() : new Element('div')).set('html', build).firstChild;
-	},
-
-	replaces: function(element){
-		element = document.id(element, true);
-		element.parentNode.replaceChild(this.toElement(), element);
-		return this;
-	},
-
-	inject: function(element){
-		document.id(element, true).appendChild(this.toElement());
-		return this;
-	},
-
-	remote: function(){
-		return Swiff.remote.apply(Swiff, [this.toElement()].append(arguments));
-	}
-
-});
-
-Swiff.CallBacks = {};
-
-Swiff.remote = function(obj, fn){
-	var rs = obj.CallFunction('<invoke name="' + fn + '" returntype="javascript">' + __flash__argumentsToXML(arguments, 2) + '</invoke>');
-	return eval(rs);
-};
-
-})();
-
diff --git a/web/tools/mootools/mootools-more-1.5.1.js b/web/tools/mootools/mootools-more-1.5.1.js
index 15a277029..80a2f8125 100644
--- a/web/tools/mootools/mootools-more-1.5.1.js
+++ b/web/tools/mootools/mootools-more-1.5.1.js
@@ -1,6 +1,6 @@
-/* MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2015 [Valerio Proietti](http://mad4milk.net/).*/ 
-/*
-Web Build: http://mootools.net/more/builder/a3048f4bfdf603b22a69c141dbd0fca9
+/* MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2017 [Valerio Proietti](https://mootools.net/).*/ 
+/*!
+Web Build: https://mootools.net/more/builder/a3048f4bfdf603b22a69c141dbd0fca9
 */
 /*
 ---
@@ -32,8 +32,8 @@ provides: [MooTools.More]
 */
 
 MooTools.More = {
-	version: '1.5.1',
-	build: '2dd695ba957196ae4b0275a690765d6636a61ccd'
+	version: '1.6.0',
+	build: '45b71db70f879781a7e0b0d3fb3bb1307c2521eb'
 };
 
 /*
@@ -63,40 +63,40 @@ provides: [Chain.Wait]
 
 (function(){
 
-	var wait = {
-		wait: function(duration){
-			return this.chain(function(){
-				this.callChain.delay(duration == null ? 500 : duration, this);
-				return this;
-			}.bind(this));
-		}
-	};
-
-	Chain.implement(wait);
-
-	if (this.Fx) Fx.implement(wait);
-
-	if (this.Element && Element.implement && this.Fx){
-		Element.implement({
-
-			chains: function(effects){
-				Array.from(effects || ['tween', 'morph', 'reveal']).each(function(effect){
-					effect = this.get(effect);
-					if (!effect) return;
-					effect.setOptions({
-						link:'chain'
-					});
-				}, this);
-				return this;
-			},
-
-			pauseFx: function(duration, effect){
-				this.chains(effect).get(effect || 'tween').wait(duration);
-				return this;
-			}
-
-		});
+var wait = {
+	wait: function(duration){
+		return this.chain(function(){
+			this.callChain.delay(duration == null ? 500 : duration, this);
+			return this;
+		}.bind(this));
 	}
+};
+
+Chain.implement(wait);
+
+if (this.Fx) Fx.implement(wait);
+
+if (this.Element && Element.implement && this.Fx){
+	Element.implement({
+
+		chains: function(effects){
+			Array.convert(effects || ['tween', 'morph', 'reveal']).each(function(effect){
+				effect = this.get(effect);
+				if (!effect) return;
+				effect.setOptions({
+					link:'chain'
+				});
+			}, this);
+			return this;
+		},
+
+		pauseFx: function(duration, effect){
+			this.chains(effect).get(effect || 'tween').wait(duration);
+			return this;
+		}
+
+	});
+}
 
 })();
 
@@ -125,12 +125,12 @@ provides: [Class.Binds]
 
 Class.Mutators.Binds = function(binds){
 	if (!this.prototype.initialize) this.implement('initialize', function(){});
-	return Array.from(binds).concat(this.prototype.Binds || []);
+	return Array.convert(binds).concat(this.prototype.Binds || []);
 };
 
 Class.Mutators.initialize = function(initialize){
 	return function(){
-		Array.from(this.Binds).each(function(name){
+		Array.convert(this.Binds).each(function(name){
 			var original = this[name];
 			if (original) this[name] = original.bind(this);
 		}, this);
@@ -222,6 +222,58 @@ Class.refactor = function(original, refactors){
 /*
 ---
 
+script: Class.Singleton.js
+
+name: Class.Singleton
+
+description: Always provides a single instance of a class
+
+license: MIT-style license.
+
+authors:
+  - Hristo Chakarov
+
+requires:
+  - Core/Class
+
+provides: [Class.Singleton]
+
+...
+*/
+
+Class.Singleton = new Class({
+
+	initialize : function(descriptor){
+		// here we keep reference of the single instance
+		var singleton;
+		// create a regular Class
+		var constructor = new Class(descriptor);
+		// We return another constructor, because we need to make sure that we
+		// always return the same one and only instance.
+		return function(){
+			if (singleton){
+				return singleton;
+			}
+			// Obviously we instantiate that class for the first time.
+			// Create brand new object & extend it with the prototype of the
+			// original `constructor`.
+			singleton = Object.append({}, constructor.prototype);
+			singleton.constructor = constructor;
+			// We also need to call the constructor as a function, passing the
+			// arguments object.
+			var returnValue = constructor.apply(singleton, arguments);
+			// In case the `constructor` returns something other than `this` -
+			// return that value; otherwise return the `singleton`.
+			singleton = typeof returnValue == 'object' ? returnValue : singleton;
+			return singleton;
+		};
+	}
+
+});
+
+/*
+---
+
 name: Events.Pseudos
 
 description: Adds the functionality to add pseudo events
@@ -405,8 +457,9 @@ provides: [Drag]
 ...
 
 */
+(function(){
 
-var Drag = new Class({
+var Drag = this.Drag = new Class({
 
 	Implements: [Events, Options],
 
@@ -424,6 +477,7 @@ var Drag = new Class({
 		limit: false,
 		handle: false,
 		invert: false,
+		unDraggableTags: ['button', 'input', 'a', 'textarea', 'select', 'option'],
 		preventDefault: false,
 		stopPropagation: false,
 		compensateScroll: false,
@@ -455,7 +509,7 @@ var Drag = new Class({
 		this.compensateScroll = {start: {}, diff: {}, last: {}};
 
 		if ('ondragstart' in document && !('FileReader' in window) && !Drag.ondragstartFixed){
-			document.ondragstart = Function.from(false);
+			document.ondragstart = Function.convert(false);
 			Drag.ondragstartFixed = true;
 		}
 
@@ -465,7 +519,7 @@ var Drag = new Class({
 			drag: this.drag.bind(this),
 			stop: this.stop.bind(this),
 			cancel: this.cancel.bind(this),
-			eventStop: Function.from(false),
+			eventStop: Function.convert(false),
 			scrollListener: this.scrollListener.bind(this)
 		};
 		this.attach();
@@ -473,12 +527,14 @@ var Drag = new Class({
 
 	attach: function(){
 		this.handles.addEvent('mousedown', this.bound.start);
+		this.handles.addEvent('touchstart', this.bound.start);
 		if (this.options.compensateScroll) this.offsetParent.addEvent('scroll', this.bound.scrollListener);
 		return this;
 	},
 
 	detach: function(){
 		this.handles.removeEvent('mousedown', this.bound.start);
+		this.handles.removeEvent('touchstart', this.bound.start);
 		if (this.options.compensateScroll) this.offsetParent.removeEvent('scroll', this.bound.scrollListener);
 		return this;
 	},
@@ -501,7 +557,7 @@ var Drag = new Class({
 
 	sumValues: function(alpha, beta, op){
 		var sum = {}, options = this.options;
-		for (z in options.modifiers){
+		for (var z in options.modifiers){
 			if (!options.modifiers[z]) continue;
 			sum[z] = alpha[z] + beta[z] * op;
 		}
@@ -509,6 +565,8 @@ var Drag = new Class({
 	},
 
 	start: function(event){
+		if (this.options.unDraggableTags.contains(event.target.get('tag'))) return;
+
 		var options = this.options;
 
 		if (event.rightClick) return;
@@ -558,7 +616,9 @@ var Drag = new Class({
 
 		var events = {
 			mousemove: this.bound.check,
-			mouseup: this.bound.cancel
+			mouseup: this.bound.cancel,
+			touchmove: this.bound.check,
+			touchend: this.bound.cancel
 		};
 		events[this.selection] = this.bound.eventStop;
 		this.document.addEvents(events);
@@ -571,7 +631,9 @@ var Drag = new Class({
 			this.cancel();
 			this.document.addEvents({
 				mousemove: this.bound.drag,
-				mouseup: this.bound.stop
+				mouseup: this.bound.stop,
+				touchmove: this.bound.drag,
+				touchend: this.bound.stop
 			});
 			this.fireEvent('start', [this.element, event]).fireEvent('snap', this.element);
 		}
@@ -584,7 +646,7 @@ var Drag = new Class({
 
 		this.render(options);
 		this.fireEvent('drag', [this.element, event]);
-	},  
+	},
 
 	render: function(options){
 		for (var z in options.modifiers){
@@ -608,7 +670,9 @@ var Drag = new Class({
 	cancel: function(event){
 		this.document.removeEvents({
 			mousemove: this.bound.check,
-			mouseup: this.bound.cancel
+			mouseup: this.bound.cancel,
+			touchmove: this.bound.check,
+			touchend: this.bound.cancel
 		});
 		if (event){
 			this.document.removeEvent(this.selection, this.bound.eventStop);
@@ -619,7 +683,9 @@ var Drag = new Class({
 	stop: function(event){
 		var events = {
 			mousemove: this.bound.drag,
-			mouseup: this.bound.stop
+			mouseup: this.bound.stop,
+			touchmove: this.bound.drag,
+			touchend: this.bound.stop
 		};
 		events[this.selection] = this.bound.eventStop;
 		this.document.removeEvents(events);
@@ -629,6 +695,9 @@ var Drag = new Class({
 
 });
 
+})();
+
+
 Element.implement({
 
 	makeResizable: function(options){
@@ -711,8 +780,8 @@ Drag.Move = new Class({
 		this.addEvent('start', this.checkDroppables, true);
 		this.overed = null;
 	},
-	
-	setContainer: function(container) {
+
+	setContainer: function(container){
 		this.container = document.id(container);
 		if (this.container && typeOf(this.container) != 'element'){
 			this.container = document.id(this.container.getDocument().body);
@@ -954,17 +1023,16 @@ Element.implement({
 		} else if (parent){
 			try { //safari sometimes crashes here, so catch it
 				dim = getSize(this, options);
-			}catch(e){}
+			} catch (e){}
 		}
 
 		return Object.append(dim, (dim.x || dim.x === 0) ? {
-				width: dim.x,
-				height: dim.y
-			} : {
-				x: dim.width,
-				y: dim.height
-			}
-		);
+			width: dim.x,
+			height: dim.y
+		} : {
+			x: dim.width,
+			y: dim.height
+		});
 	},
 
 	getComputedSize: function(options){
@@ -1045,8 +1113,9 @@ provides: [Slider]
 
 ...
 */
+(function(){
 
-var Slider = new Class({
+var Slider = this.Slider = new Class({
 
 	Implements: [Events, Options],
 
@@ -1189,7 +1258,7 @@ var Slider = new Class({
 		if (range) this.set(Array.pick([pos, this.step]).limit(this.min,this.max), silently);
 		return this;
 	},
-    
+
 	setModulus: function(){
 		var decimals = ((this.stepSize + '').split('.')[1] || []).length,
 			modulus = 1 + '';
@@ -1259,6 +1328,9 @@ var Slider = new Class({
 
 });
 
+})();
+
+
 /*
 ---
 
@@ -1281,8 +1353,9 @@ provides: [Sortables]
 
 ...
 */
+(function(){
 
-var Sortables = new Class({
+var Sortables = this.Sortables = new Class({
 
 	Implements: [Events, Options],
 
@@ -1361,8 +1434,8 @@ var Sortables = new Class({
 			return list;
 		}, this));
 	},
-    
-	getDroppableCoordinates: function (element){
+
+	getDroppableCoordinates: function(element){
 		var offsetParent = element.getOffsetParent();
 		var position = element.getPosition(offsetParent);
 		var scroll = {
@@ -1377,7 +1450,7 @@ var Sortables = new Class({
 			position.y -= scroll.w.y;
 		}
 
-        return position;
+		return position;
 	},
 
 	getClone: function(event, element){
@@ -1479,7 +1552,7 @@ var Sortables = new Class({
 			this.clone.destroy();
 			self.reset();
 		}
-		
+
 	},
 
 	reset: function(){
@@ -1507,6 +1580,8 @@ var Sortables = new Class({
 
 });
 
+})();
+
 /*
 ---
 
@@ -1626,7 +1701,7 @@ DOMEvent.defineKeys({
 	'107': '+',
 	'109': '-', // subtract
 	'189': '-'  // dash
-})
+});
 
 })();
 
@@ -1659,66 +1734,66 @@ provides: [String.Extras]
 (function(){
 
 var special = {
-	'a': /[àáâãäåăą]/g,
-	'A': /[ÀÁÂÃÄÅĂĄ]/g,
-	'c': /[ćčç]/g,
-	'C': /[ĆČÇ]/g,
-	'd': /[ďđ]/g,
-	'D': /[ĎÐ]/g,
-	'e': /[èéêëěę]/g,
-	'E': /[ÈÉÊËĚĘ]/g,
-	'g': /[ğ]/g,
-	'G': /[Ğ]/g,
-	'i': /[ìíîï]/g,
-	'I': /[ÌÍÎÏ]/g,
-	'l': /[ĺľł]/g,
-	'L': /[ĹĽŁ]/g,
-	'n': /[ñňń]/g,
-	'N': /[ÑŇŃ]/g,
-	'o': /[òóôõöøő]/g,
-	'O': /[ÒÓÔÕÖØ]/g,
-	'r': /[řŕ]/g,
-	'R': /[ŘŔ]/g,
-	's': /[ššş]/g,
-	'S': /[ŠŞŚ]/g,
-	't': /[ťţ]/g,
-	'T': /[ŤŢ]/g,
-	'u': /[ùúûůüµ]/g,
-	'U': /[ÙÚÛŮÜ]/g,
-	'y': /[ÿý]/g,
-	'Y': /[ŸÝ]/g,
-	'z': /[žźż]/g,
-	'Z': /[ŽŹŻ]/g,
-	'th': /[þ]/g,
-	'TH': /[Þ]/g,
-	'dh': /[ð]/g,
-	'DH': /[Ð]/g,
-	'ss': /[ß]/g,
-	'oe': /[œ]/g,
-	'OE': /[Œ]/g,
-	'ae': /[æ]/g,
-	'AE': /[Æ]/g
-},
+		'a': /[àáâãäåăą]/g,
+		'A': /[ÀÁÂÃÄÅĂĄ]/g,
+		'c': /[ćčç]/g,
+		'C': /[ĆČÇ]/g,
+		'd': /[ďđ]/g,
+		'D': /[ĎÐ]/g,
+		'e': /[èéêëěę]/g,
+		'E': /[ÈÉÊËĚĘ]/g,
+		'g': /[ğ]/g,
+		'G': /[Ğ]/g,
+		'i': /[ìíîï]/g,
+		'I': /[ÌÍÎÏ]/g,
+		'l': /[ĺľł]/g,
+		'L': /[ĹĽŁ]/g,
+		'n': /[ñňń]/g,
+		'N': /[ÑŇŃ]/g,
+		'o': /[òóôõöøő]/g,
+		'O': /[ÒÓÔÕÖØ]/g,
+		'r': /[řŕ]/g,
+		'R': /[ŘŔ]/g,
+		's': /[ššş]/g,
+		'S': /[ŠŞŚ]/g,
+		't': /[ťţ]/g,
+		'T': /[ŤŢ]/g,
+		'u': /[ùúûůüµ]/g,
+		'U': /[ÙÚÛŮÜ]/g,
+		'y': /[ÿý]/g,
+		'Y': /[ŸÝ]/g,
+		'z': /[žźż]/g,
+		'Z': /[ŽŹŻ]/g,
+		'th': /[þ]/g,
+		'TH': /[Þ]/g,
+		'dh': /[ð]/g,
+		'DH': /[Ð]/g,
+		'ss': /[ß]/g,
+		'oe': /[œ]/g,
+		'OE': /[Œ]/g,
+		'ae': /[æ]/g,
+		'AE': /[Æ]/g
+	},
 
-tidy = {
-	' ': /[\xa0\u2002\u2003\u2009]/g,
-	'*': /[\xb7]/g,
-	'\'': /[\u2018\u2019]/g,
-	'"': /[\u201c\u201d]/g,
-	'...': /[\u2026]/g,
-	'-': /[\u2013]/g,
-//	'--': /[\u2014]/g,
-	'&raquo;': /[\uFFFD]/g
-},
+	tidy = {
+		' ': /[\xa0\u2002\u2003\u2009]/g,
+		'*': /[\xb7]/g,
+		'\'': /[\u2018\u2019]/g,
+		'"': /[\u201c\u201d]/g,
+		'...': /[\u2026]/g,
+		'-': /[\u2013]/g,
+	//	'--': /[\u2014]/g,
+		'&raquo;': /[\uFFFD]/g
+	},
 
-conversions = {
-	ms: 1,
-	s: 1000,
-	m: 6e4,
-	h: 36e5
-},
+	conversions = {
+		ms: 1,
+		s: 1000,
+		m: 6e4,
+		h: 36e5
+	},
 
-findUnits = /(\d*.?\d+)([msh]+)/;
+	findUnits = /(\d*.?\d+)([msh]+)/;
 
 var walk = function(string, replacements){
 	var result = string, key;
@@ -1727,10 +1802,9 @@ var walk = function(string, replacements){
 };
 
 var getRegexForTag = function(tag, contents){
-	tag = tag || '';
-	var regstr = contents ? "<" + tag + "(?!\\w)[^>]*>([\\s\\S]*?)<\/" + tag + "(?!\\w)>" : "<\/?" + tag + "([^>]+)?>",
-		reg = new RegExp(regstr, "gi");
-	return reg;
+	tag = tag || (contents ? '' : '\\w+');
+	var regstr = contents ? '<' + tag + '(?!\\w)[^>]*>([\\s\\S]*?)<\/' + tag + '(?!\\w)>' : '<\/?' + tag + '\/?>|<' + tag + '[\\s|\/][^>]*>';
+	return new RegExp(regstr, 'gi');
 };
 
 String.implement({
@@ -1783,7 +1857,7 @@ String.implement({
 	},
 
 	ms: function(){
-	  // "Borrowed" from https://gist.github.com/1503944
+		// "Borrowed" from https://gist.github.com/1503944
 		var units = findUnits.exec(this);
 		if (units == null) return Number(this);
 		return Number(units[1]) * conversions[units[2]];
@@ -1960,106 +2034,106 @@ provides: [Element.Pin]
 */
 
 (function(){
-	var supportsPositionFixed = false,
-		supportTested = false;
+var supportsPositionFixed = false,
+	supportTested = false;
 
-	var testPositionFixed = function(){
-		var test = new Element('div').setStyles({
-			position: 'fixed',
-			top: 0,
-			right: 0
-		}).inject(document.body);
-		supportsPositionFixed = (test.offsetTop === 0);
-		test.dispose();
-		supportTested = true;
-	};
+var testPositionFixed = function(){
+	var test = new Element('div').setStyles({
+		position: 'fixed',
+		top: 0,
+		right: 0
+	}).inject(document.body);
+	supportsPositionFixed = (test.offsetTop === 0);
+	test.dispose();
+	supportTested = true;
+};
 
-	Element.implement({
+Element.implement({
 
-		pin: function(enable, forceScroll){
-			if (!supportTested) testPositionFixed();
-			if (this.getStyle('display') == 'none') return this;
+	pin: function(enable, forceScroll){
+		if (!supportTested) testPositionFixed();
+		if (this.getStyle('display') == 'none') return this;
 
-			var pinnedPosition,
-				scroll = window.getScroll(),
-				parent,
-				scrollFixer;
+		var pinnedPosition,
+			scroll = window.getScroll(),
+			parent,
+			scrollFixer;
 
-			if (enable !== false){
-				pinnedPosition = this.getPosition();
-				if (!this.retrieve('pin:_pinned')) {
-					var currentPosition = {
-						top: pinnedPosition.y - scroll.y,
-						left: pinnedPosition.x - scroll.x,
-						margin: '0px',
-						padding: '0px'
+		if (enable !== false){
+			pinnedPosition = this.getPosition();
+			if (!this.retrieve('pin:_pinned')){
+				var currentPosition = {
+					top: pinnedPosition.y - scroll.y,
+					left: pinnedPosition.x - scroll.x,
+					margin: '0px',
+					padding: '0px'
+				};
+
+				if (supportsPositionFixed && !forceScroll){
+					this.setStyle('position', 'fixed').setStyles(currentPosition);
+				} else {
+
+					parent = this.getOffsetParent();
+					var position = this.getPosition(parent),
+						styles = this.getStyles('left', 'top');
+
+					if (parent && styles.left == 'auto' || styles.top == 'auto') this.setPosition(position);
+					if (this.getStyle('position') == 'static') this.setStyle('position', 'absolute');
+
+					position = {
+						x: styles.left.toInt() - scroll.x,
+						y: styles.top.toInt() - scroll.y
 					};
 
-					if (supportsPositionFixed && !forceScroll){
-						this.setStyle('position', 'fixed').setStyles(currentPosition);
-					} else {
+					scrollFixer = function(){
+						if (!this.retrieve('pin:_pinned')) return;
+						var scroll = window.getScroll();
+						this.setStyles({
+							left: position.x + scroll.x,
+							top: position.y + scroll.y
+						});
+					}.bind(this);
 
-						parent = this.getOffsetParent();
-						var position = this.getPosition(parent),
-							styles = this.getStyles('left', 'top');
-
-						if (parent && styles.left == 'auto' || styles.top == 'auto') this.setPosition(position);
-						if (this.getStyle('position') == 'static') this.setStyle('position', 'absolute');
-
-						position = {
-							x: styles.left.toInt() - scroll.x,
-							y: styles.top.toInt() - scroll.y
-						};
-
-						scrollFixer = function(){
-							if (!this.retrieve('pin:_pinned')) return;
-							var scroll = window.getScroll();
-							this.setStyles({
-								left: position.x + scroll.x,
-								top: position.y + scroll.y
-							});
-						}.bind(this);
-
-						this.store('pin:_scrollFixer', scrollFixer);
-						window.addEvent('scroll', scrollFixer);
-					}
-					this.store('pin:_pinned', true);
+					this.store('pin:_scrollFixer', scrollFixer);
+					window.addEvent('scroll', scrollFixer);
 				}
-
-			} else {
-				if (!this.retrieve('pin:_pinned')) return this;
-
-				parent = this.getParent();
-				var offsetParent = (parent.getComputedStyle('position') != 'static' ? parent : parent.getOffsetParent());
-
-				pinnedPosition = this.getPosition();
-
-				this.store('pin:_pinned', false);
-				scrollFixer = this.retrieve('pin:_scrollFixer');
-				if (!scrollFixer){
-					this.setStyles({
-						position: 'absolute',
-						top: pinnedPosition.y + scroll.y,
-						left: pinnedPosition.x + scroll.x
-					});
-				} else {
-					this.store('pin:_scrollFixer', null);
-					window.removeEvent('scroll', scrollFixer);
-				}
-				this.removeClass('isPinned');
+				this.store('pin:_pinned', true);
 			}
-			return this;
-		},
 
-		unpin: function(){
-			return this.pin(false);
-		},
+		} else {
+			if (!this.retrieve('pin:_pinned')) return this;
 
-		togglePin: function(){
-			return this.pin(!this.retrieve('pin:_pinned'));
+			parent = this.getParent();
+			var offsetParent = (parent.getComputedStyle('position') != 'static' ? parent : parent.getOffsetParent());
+
+			pinnedPosition = this.getPosition();
+
+			this.store('pin:_pinned', false);
+			scrollFixer = this.retrieve('pin:_scrollFixer');
+			if (!scrollFixer){
+				this.setStyles({
+					position: 'absolute',
+					top: pinnedPosition.y + scroll.y,
+					left: pinnedPosition.x + scroll.x
+				});
+			} else {
+				this.store('pin:_scrollFixer', null);
+				window.removeEvent('scroll', scrollFixer);
+			}
+			this.removeClass('isPinned');
 		}
+		return this;
+	},
 
-	});
+	unpin: function(){
+		return this.pin(false);
+	},
+
+	togglePin: function(){
+		return this.pin(!this.retrieve('pin:_pinned'));
+	}
+
+});
 
 
 
@@ -2199,13 +2273,13 @@ var local = Element.Position = {
 			left = calc.x,
 			winSize = window.getSize();
 
-		switch(options.position.x){
+		switch (options.position.x){
 			case 'left': position.x = left + offsetX; break;
 			case 'right': position.x = left + offsetX + relativeTo.offsetWidth; break;
 			default: position.x = left + ((relativeTo == document.body ? winSize.x : relativeTo.offsetWidth) / 2) + offsetX; break;
 		}
 
-		switch(options.position.y){
+		switch (options.position.y){
 			case 'top': position.y = top + offsetY; break;
 			case 'bottom': position.y = top + offsetY + relativeTo.offsetHeight; break;
 			default: position.y = top + ((relativeTo == document.body ? winSize.y : relativeTo.offsetHeight) / 2) + offsetY; break;
@@ -2253,14 +2327,14 @@ var local = Element.Position = {
 			dimensions = options.dimensions,
 			edge = options.edge;
 
-		switch(edge.x){
+		switch (edge.x){
 			case 'left': edgeOffset.x = 0; break;
 			case 'right': edgeOffset.x = -dimensions.x - dimensions.computedRight - dimensions.computedLeft; break;
 			// center
 			default: edgeOffset.x = -(Math.round(dimensions.totalWidth / 2)); break;
 		}
 
-		switch(edge.y){
+		switch (edge.y){
 			case 'top': edgeOffset.y = 0; break;
 			case 'bottom': edgeOffset.y = -dimensions.y - dimensions.computedTop - dimensions.computedBottom; break;
 			// center
@@ -2347,7 +2421,7 @@ Element.implement({
 		try {
 			//IE fails here if the element is not in the dom
 			d = this.getStyle('display');
-		} catch(e){}
+		} catch (e){}
 		if (d == 'none') return this;
 		return this.store('element:_originalDisplay', d || '').setStyle('display', 'none');
 	},
@@ -2374,7 +2448,7 @@ Document.implement({
 			try {
 				//IE fails here if selected element is not in dom
 				document.selection.empty();
-			} catch(e){}
+			} catch (e){}
 		}
 	}
 
@@ -2453,7 +2527,7 @@ provides: [IframeShim]
 var browsers = false;
 
 
-this.IframeShim = new Class({
+var IframeShim = this.IframeShim = new Class({
 
 	Implements: [Options, Events, Class.Occlude],
 
@@ -2509,7 +2583,7 @@ this.IframeShim = new Class({
 			if (!IframeShim.ready) window.addEvent('load', inject);
 			else inject();
 		} else {
-			this.position = this.hide = this.show = this.dispose = Function.from(this);
+			this.position = this.hide = this.show = this.dispose = Function.convert(this);
 		}
 	},
 
@@ -2585,8 +2659,9 @@ provides: [Mask]
 
 ...
 */
+(function(){
 
-var Mask = new Class({
+var Mask = this.Mask = new Class({
 
 	Implements: [Options, Events],
 
@@ -2737,6 +2812,9 @@ var Mask = new Class({
 
 });
 
+})();
+
+
 Element.Properties.mask = {
 
 	set: function(options){
@@ -2795,10 +2873,11 @@ provides: [Spinner]
 
 ...
 */
+(function(){
 
-var Spinner = new Class({
+var Spinner = this.Spinner = new Class({
 
-	Extends: Mask,
+	Extends: this.Mask,
 
 	Implements: Chain,
 
@@ -2923,6 +3002,8 @@ var Spinner = new Class({
 
 });
 
+})();
+
 Request = Class.refactor(Request, {
 
 	options: {
@@ -3019,6 +3100,22 @@ provides: [String.QueryString]
 ...
 */
 
+(function(){
+
+/**
+ * decodeURIComponent doesn't do the correct thing with query parameter keys or
+ * values. Specifically, it leaves '+' as '+' when it should be converting them
+ * to spaces as that's the specification. When browsers submit HTML forms via
+ * GET, the values are encoded using 'application/x-www-form-urlencoded'
+ * which converts spaces to '+'.
+ *
+ * See: http://unixpapa.com/js/querystring.html for a description of the
+ * problem.
+ */
+var decodeComponent = function(str){
+	return decodeURIComponent(str.replace(/\+/g, ' '));
+};
+
 String.implement({
 
 	parseQueryString: function(decodeKeys, decodeValues){
@@ -3035,9 +3132,9 @@ String.implement({
 				keys = index ? val.substr(0, index - 1).match(/([^\]\[]+|(\B)(?=\]))/g) : [val],
 				obj = object;
 			if (!keys) return;
-			if (decodeValues) value = decodeURIComponent(value);
+			if (decodeValues) value = decodeComponent(value);
 			keys.each(function(key, i){
-				if (decodeKeys) key = decodeURIComponent(key);
+				if (decodeKeys) key = decodeComponent(key);
 				var current = obj[key];
 
 				if (i < keys.length - 1) obj = obj[key] = current || {};
@@ -3061,6 +3158,8 @@ String.implement({
 
 });
 
+})();
+
 /*
 ---
 
@@ -3092,176 +3191,176 @@ if (!window.Form) window.Form = {};
 
 (function(){
 
-	Form.Request = new Class({
+Form.Request = new Class({
 
-		Binds: ['onSubmit', 'onFormValidate'],
+	Binds: ['onSubmit', 'onFormValidate'],
 
-		Implements: [Options, Events, Class.Occlude],
+	Implements: [Options, Events, Class.Occlude],
 
-		options: {/*
-			onFailure: function(){},
-			onSuccess: function(){}, // aliased to onComplete,
-			onSend: function(){}*/
-			requestOptions: {
-				evalScripts: true,
-				useSpinner: true,
-				emulation: false,
-				link: 'ignore'
-			},
-			sendButtonClicked: true,
-			extraData: {},
-			resetForm: true
+	options: {/*
+		onFailure: function(){},
+		onSuccess: function(){}, // aliased to onComplete,
+		onSend: function(){}*/
+		requestOptions: {
+			evalScripts: true,
+			useSpinner: true,
+			emulation: false,
+			link: 'ignore'
 		},
+		sendButtonClicked: true,
+		extraData: {},
+		resetForm: true
+	},
 
-		property: 'form.request',
+	property: 'form.request',
 
-		initialize: function(form, target, options){
-			this.element = document.id(form);
-			if (this.occlude()) return this.occluded;
-			this.setOptions(options)
-				.setTarget(target)
-				.attach();
-		},
+	initialize: function(form, target, options){
+		this.element = document.id(form);
+		if (this.occlude()) return this.occluded;
+		this.setOptions(options)
+			.setTarget(target)
+			.attach();
+	},
 
-		setTarget: function(target){
-			this.target = document.id(target);
-			if (!this.request){
-				this.makeRequest();
-			} else {
-				this.request.setOptions({
-					update: this.target
-				});
-			}
-			return this;
-		},
-
-		toElement: function(){
-			return this.element;
-		},
-
-		makeRequest: function(){
-			var self = this;
-			this.request = new Request.HTML(Object.merge({
-					update: this.target,
-					emulation: false,
-					spinnerTarget: this.element,
-					method: this.element.get('method') || 'post'
-			}, this.options.requestOptions)).addEvents({
-				success: function(tree, elements, html, javascript){
-					['complete', 'success'].each(function(evt){
-						self.fireEvent(evt, [self.target, tree, elements, html, javascript]);
-					});
-				},
-				failure: function(){
-					self.fireEvent('complete', arguments).fireEvent('failure', arguments);
-				},
-				exception: function(){
-					self.fireEvent('failure', arguments);
-				}
-			});
-			return this.attachReset();
-		},
-
-		attachReset: function(){
-			if (!this.options.resetForm) return this;
-			this.request.addEvent('success', function(){
-				Function.attempt(function(){
-					this.element.reset();
-				}.bind(this));
-				if (window.OverText) OverText.update();
-			}.bind(this));
-			return this;
-		},
-
-		attach: function(attach){
-			var method = (attach != false) ? 'addEvent' : 'removeEvent';
-			this.element[method]('click:relay(button, input[type=submit])', this.saveClickedButton.bind(this));
-
-			var fv = this.element.retrieve('validator');
-			if (fv) fv[method]('onFormValidate', this.onFormValidate);
-			else this.element[method]('submit', this.onSubmit);
-
-			return this;
-		},
-
-		detach: function(){
-			return this.attach(false);
-		},
-
-		//public method
-		enable: function(){
-			return this.attach();
-		},
-
-		//public method
-		disable: function(){
-			return this.detach();
-		},
-
-		onFormValidate: function(valid, form, event){
-			//if there's no event, then this wasn't a submit event
-			if (!event) return;
-			var fv = this.element.retrieve('validator');
-			if (valid || (fv && !fv.options.stopOnFailure)){
-				event.stop();
-				this.send();
-			}
-		},
-
-		onSubmit: function(event){
-			var fv = this.element.retrieve('validator');
-			if (fv){
-				//form validator was created after Form.Request
-				this.element.removeEvent('submit', this.onSubmit);
-				fv.addEvent('onFormValidate', this.onFormValidate);
-				fv.validate(event);
-				return;
-			}
-			if (event) event.stop();
-			this.send();
-		},
-
-		saveClickedButton: function(event, target){
-			var targetName = target.get('name');
-			if (!targetName || !this.options.sendButtonClicked) return;
-			this.options.extraData[targetName] = target.get('value') || true;
-			this.clickedCleaner = function(){
-				delete this.options.extraData[targetName];
-				this.clickedCleaner = function(){};
-			}.bind(this);
-		},
-
-		clickedCleaner: function(){},
-
-		send: function(){
-			var str = this.element.toQueryString().trim(),
-				data = Object.toQueryString(this.options.extraData);
-
-			if (str) str += "&" + data;
-			else str = data;
-
-			this.fireEvent('send', [this.element, str.parseQueryString()]);
-			this.request.send({
-				data: str,
-				url: this.options.requestOptions.url || this.element.get('action')
-			});
-			this.clickedCleaner();
-			return this;
-		}
-
-	});
-
-	Element.implement('formUpdate', function(update, options){
-		var fq = this.retrieve('form.request');
-		if (!fq){
-			fq = new Form.Request(this, update, options);
+	setTarget: function(target){
+		this.target = document.id(target);
+		if (!this.request){
+			this.makeRequest();
 		} else {
-			if (update) fq.setTarget(update);
-			if (options) fq.setOptions(options).makeRequest();
+			this.request.setOptions({
+				update: this.target
+			});
 		}
-		fq.send();
 		return this;
-	});
+	},
+
+	toElement: function(){
+		return this.element;
+	},
+
+	makeRequest: function(){
+		var self = this;
+		this.request = new Request.HTML(Object.merge({
+			update: this.target,
+			emulation: false,
+			spinnerTarget: this.element,
+			method: this.element.get('method') || 'post'
+		}, this.options.requestOptions)).addEvents({
+			success: function(tree, elements, html, javascript){
+				['complete', 'success'].each(function(evt){
+					self.fireEvent(evt, [self.target, tree, elements, html, javascript]);
+				});
+			},
+			failure: function(){
+				self.fireEvent('complete', arguments).fireEvent('failure', arguments);
+			},
+			exception: function(){
+				self.fireEvent('failure', arguments);
+			}
+		});
+		return this.attachReset();
+	},
+
+	attachReset: function(){
+		if (!this.options.resetForm) return this;
+		this.request.addEvent('success', function(){
+			Function.attempt(function(){
+				this.element.reset();
+			}.bind(this));
+			if (window.OverText) OverText.update();
+		}.bind(this));
+		return this;
+	},
+
+	attach: function(attach){
+		var method = (attach != false) ? 'addEvent' : 'removeEvent';
+		this.element[method]('click:relay(button, input[type=submit])', this.saveClickedButton.bind(this));
+
+		var fv = this.element.retrieve('validator');
+		if (fv) fv[method]('onFormValidate', this.onFormValidate);
+		else this.element[method]('submit', this.onSubmit);
+
+		return this;
+	},
+
+	detach: function(){
+		return this.attach(false);
+	},
+
+	//public method
+	enable: function(){
+		return this.attach();
+	},
+
+	//public method
+	disable: function(){
+		return this.detach();
+	},
+
+	onFormValidate: function(valid, form, event){
+		//if there's no event, then this wasn't a submit event
+		if (!event) return;
+		var fv = this.element.retrieve('validator');
+		if (valid || (fv && !fv.options.stopOnFailure)){
+			event.stop();
+			this.send();
+		}
+	},
+
+	onSubmit: function(event){
+		var fv = this.element.retrieve('validator');
+		if (fv){
+			//form validator was created after Form.Request
+			this.element.removeEvent('submit', this.onSubmit);
+			fv.addEvent('onFormValidate', this.onFormValidate);
+			fv.validate(event);
+			return;
+		}
+		if (event) event.stop();
+		this.send();
+	},
+
+	saveClickedButton: function(event, target){
+		var targetName = target.get('name');
+		if (!targetName || !this.options.sendButtonClicked) return;
+		this.options.extraData[targetName] = target.get('value') || true;
+		this.clickedCleaner = function(){
+			delete this.options.extraData[targetName];
+			this.clickedCleaner = function(){};
+		}.bind(this);
+	},
+
+	clickedCleaner: function(){},
+
+	send: function(){
+		var str = this.element.toQueryString().trim(),
+			data = Object.toQueryString(this.options.extraData);
+
+		if (str) str += '&' + data;
+		else str = data;
+
+		this.fireEvent('send', [this.element, str.parseQueryString()]);
+		this.request.send({
+			data: str,
+			url: this.options.requestOptions.url || this.element.get('action')
+		});
+		this.clickedCleaner();
+		return this;
+	}
+
+});
+
+Element.implement('formUpdate', function(update, options){
+	var fq = this.retrieve('form.request');
+	if (!fq){
+		fq = new Form.Request(this, update, options);
+	} else {
+		if (update) fq.setTarget(update);
+		if (options) fq.setOptions(options).makeRequest();
+	}
+	fq.send();
+	return this;
+});
 
 })();
 
@@ -3346,7 +3445,7 @@ Fx.Reveal = new Class({
 				});
 
 				this.element.setStyles({
-					display: Function.from(this.options.display).call(this),
+					display: Function.convert(this.options.display).call(this),
 					overflow: 'hidden'
 				});
 
@@ -3403,7 +3502,7 @@ Fx.Reveal = new Class({
 
 				var zero = {
 					height: 0,
-					display: Function.from(this.options.display).call(this)
+					display: Function.convert(this.options.display).call(this)
 				};
 				Object.each(startStyles, function(style, name){
 					zero[name] = 0;
@@ -3417,7 +3516,7 @@ Fx.Reveal = new Class({
 
 				this.$chain.unshift(function(){
 					this.element.style.cssText = this.cssText;
-					this.element.setStyle('display', Function.from(this.options.display).call(this));
+					this.element.setStyle('display', Function.convert(this.options.display).call(this));
 					if (!this.hidden) this.showing = false;
 					if (hideThese) hideThese.setStyle('visibility', 'visible');
 					this.callChain();
@@ -3549,20 +3648,19 @@ Form.Request.Append = new Class({
 
 	makeRequest: function(){
 		this.request = new Request.HTML(Object.merge({
-				url: this.element.get('action'),
-				method: this.element.get('method') || 'post',
-				spinnerTarget: this.element
-			}, this.options.requestOptions, {
-				evalScripts: false
-			})
-		).addEvents({
+			url: this.element.get('action'),
+			method: this.element.get('method') || 'post',
+			spinnerTarget: this.element
+		}, this.options.requestOptions, {
+			evalScripts: false
+		})).addEvents({
 			success: function(tree, elements, html, javascript){
 				var container;
 				var kids = Elements.from(html);
 				if (kids.length == 1){
 					container = kids[0];
 				} else {
-					 container = new Element('div', {
+					container = new Element('div', {
 						styles: {
 							display: 'none'
 						}
@@ -3782,7 +3880,7 @@ Locale.Set = new Class({
 		var value = Object.getFromPath(this.sets, key);
 		if (value != null){
 			var type = typeOf(value);
-			if (type == 'function') value = value.apply(null, Array.from(args));
+			if (type == 'function') value = value.apply(null, Array.convert(args));
 			else if (type == 'object') value = Object.clone(value);
 			return value;
 		}
@@ -3808,7 +3906,7 @@ Locale.Set = new Class({
 	},
 
 	inherit: function(names, set){
-		names = Array.from(names);
+		names = Array.convert(names);
 
 		if (set && !this.inherits.sets[set]) this.inherits.sets[set] = [];
 
@@ -3938,9 +4036,11 @@ var DateMethods = Date.Methods = {
 	hr: 'Hours'
 };
 
-['Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset',
+[
+	'Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset',
 	'Week', 'Timezone', 'GMTOffset', 'DayOfYear', 'LastMonth', 'LastDayOfMonth', 'UTCDate', 'UTCDay', 'UTCFullYear',
-	'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds', 'UTCMilliseconds'].each(function(method){
+	'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds', 'UTCMilliseconds'
+].each(function(method){
 	Date.Methods[method.toLowerCase()] = method;
 });
 
@@ -4225,12 +4325,12 @@ Date.extend({
 	},
 
 	units: {
-		ms: Function.from(1),
-		second: Function.from(1000),
-		minute: Function.from(60000),
-		hour: Function.from(3600000),
-		day: Function.from(86400000),
-		week: Function.from(608400000),
+		ms: Function.convert(1),
+		second: Function.convert(1000),
+		minute: Function.convert(60000),
+		hour: Function.convert(3600000),
+		day: Function.convert(86400000),
+		week: Function.convert(608400000),
 		month: function(month, year){
 			var d = new Date;
 			return Date.daysInMonth(month != null ? month : d.get('mo'), year != null ? year : d.get('year')) * 86400000;
@@ -4374,13 +4474,13 @@ var build = function(format){
 
 	var parsed = [];
 	var re = (format.source || format) // allow format to be regex
-	 .replace(/%([a-z])/gi,
+	.replace(/%([a-z])/gi,
 		function($0, $1){
 			return replacers($1) || $0;
 		}
 	).replace(/\((?!\?)/g, '(?:') // make all groups non-capturing
-	 .replace(/ (?!\?|\*)/g, ',? ') // be forgiving with spaces and commas
-	 .replace(/%([a-z%])/gi,
+	.replace(/ (?!\?|\*)/g, ',? ') // be forgiving with spaces and commas
+	.replace(/%([a-z%])/gi,
 		function($0, $1){
 			var p = keys[$1];
 			if (!p) return $1;
@@ -4552,7 +4652,7 @@ var InputValidator = this.InputValidator = new Class({
 
 	options: {
 		errorMsg: 'Validation failed.',
-		test: Function.from(true)
+		test: Function.convert(true)
 	},
 
 	initialize: function(className, options){
@@ -4582,7 +4682,9 @@ var InputValidator = this.InputValidator = new Class({
 Element.Properties.validators = {
 
 	get: function(){
-		return (this.get('data-validators') || this.className).clean().split(' ');
+		return (this.get('data-validators') || this.className).clean().replace(/'(\\.|[^'])*'|"(\\.|[^"])*"/g, function(match){
+			return match.replace(' ', '\\x20');
+		}).split(' ');
 	}
 
 };
@@ -4599,7 +4701,7 @@ Element.Properties.validatorProps = {
 		if (this.getProperty('data-validator-properties') || this.getProperty('validatorProps')){
 			try {
 				this.store('$moo:validatorProps', JSON.decode(this.getProperty('validatorProps') || this.getProperty('data-validator-properties'), false));
-			}catch(e){
+			} catch (e){
 				return {};
 			}
 		} else {
@@ -4615,7 +4717,7 @@ Element.Properties.validatorProps = {
 					if (split[1]){
 						try {
 							props[split[0]] = JSON.decode(split[1], false);
-						} catch(e){}
+						} catch (e){}
 					}
 				});
 				this.store('$moo:validatorProps', props);
@@ -4655,8 +4757,8 @@ Form.Validator = new Class({
 	initialize: function(form, options){
 		this.setOptions(options);
 		this.element = document.id(form);
-		this.warningPrefix = Function.from(this.options.warningPrefix)();
-		this.errorPrefix = Function.from(this.options.errorPrefix)();
+		this.warningPrefix = Function.convert(this.options.warningPrefix)();
+		this.errorPrefix = Function.convert(this.options.errorPrefix)();
 		this._bound = {
 			onSubmit: this.onSubmit.bind(this),
 			blurOrChange: function(event, field){
@@ -4842,7 +4944,7 @@ Form.Validator.adders = {
 	},
 
 	addAllThese : function(validators){
-		Array.from(validators).each(function(validator){
+		Array.convert(validators).each(function(validator){
 			this.add(validator[0], validator[1]);
 		}, this);
 	},
@@ -5080,13 +5182,23 @@ provides: [Form.Validator.Extras]
 
 ...
 */
+
+(function(){
+
+function getItems(props, preference, children, cssSelector){
+	if (preference && props[preference]) return props[preference];
+	var el = document.id(props[children]);
+	if (!el) return [];
+	return el.getElements(cssSelector);
+}
+
 Form.Validator.addAllThese([
 
 	['validate-enforce-oncheck', {
 		test: function(element, props){
 			var fv = element.getParent('form').retrieve('validator');
 			if (!fv) return true;
-			(props.toEnforce || document.id(props.enforceChildrenOf).getElements('input, select, textarea')).map(function(item){
+			getItems(props, 'toEnforce', 'enforceChildrenOf', 'input, select, textarea').each(function(item){
 				if (element.checked){
 					fv.enforceField(item);
 				} else {
@@ -5102,7 +5214,7 @@ Form.Validator.addAllThese([
 		test: function(element, props){
 			var fv = element.getParent('form').retrieve('validator');
 			if (!fv) return true;
-			(props.toIgnore || document.id(props.ignoreChildrenOf).getElements('input, select, textarea')).each(function(item){
+			getItems(props, 'toIgnore', 'ignoreChildrenOf', 'input, select, textarea').each(function(item){
 				if (element.checked){
 					fv.ignoreField(item);
 					fv.resetField(item);
@@ -5114,6 +5226,23 @@ Form.Validator.addAllThese([
 		}
 	}],
 
+	['validate-enforce-onselect-value', {
+		test: function(element, props){
+			if (!props.value) return true;
+			var fv = element.getParent('form').retrieve('validator');
+			if (!fv) return true;
+			getItems(props, 'toEnforce', 'enforceChildrenOf', 'input, select, textarea').each(function(item){
+				if (props.value == element.value){
+					fv.enforceField(item);
+				} else {
+					fv.ignoreField(item);
+					fv.resetField(item);
+				}
+			});
+			return true;
+		}
+	}],
+
 	['validate-nospace', {
 		errorMsg: function(){
 			return Form.Validator.getMsg('noSpace');
@@ -5127,7 +5256,7 @@ Form.Validator.addAllThese([
 		test: function(element, props){
 			var fv = element.getParent('form').retrieve('validator');
 			if (!fv) return true;
-			var eleArr = props.toToggle || document.id(props.toToggleChildrenOf).getElements('input, select, textarea');
+			var eleArr = getItems(props, 'toToggle', 'toToggleChildrenOf', 'input, select, textarea');
 			if (!element.checked){
 				eleArr.each(function(item){
 					fv.ignoreField(item);
@@ -5147,7 +5276,7 @@ Form.Validator.addAllThese([
 			return Form.Validator.getMsg('reqChkByNode');
 		},
 		test: function(element, props){
-			return (document.id(props.nodeId).getElements(props.selector || 'input[type=checkbox], input[type=radio]')).some(function(item){
+			return getItems(props, false, 'nodeId', props.selector || 'input[type=checkbox], input[type=radio]').some(function(item){
 				return item.checked;
 			});
 		}
@@ -5168,18 +5297,21 @@ Form.Validator.addAllThese([
 		},
 		test: function(element, props){
 			var grpName = props.groupName || element.get('name');
-			var oneCheckedItem = $$(document.getElementsByName(grpName)).some(function(item, index){
+			var grpNameEls = $$('[name=' + grpName +']');
+			var oneCheckedItem = grpNameEls.some(function(item, index){
 				return item.checked;
 			});
 			var fv = element.getParent('form').retrieve('validator');
-			if (oneCheckedItem && fv) fv.resetField(element);
+			if (oneCheckedItem && fv){
+				grpNameEls.each(function(item, index){ fv.resetField(item); });
+			}
 			return oneCheckedItem;
 		}
 	}],
 
 	['validate-match', {
 		errorMsg: function(element, props){
-			return Form.Validator.getMsg('match').substitute({matchName: props.matchName || document.id(props.matchInput).get('name')});
+			return Form.Validator.getMsg('match').substitute({matchName: decodeURIComponent((props.matchName+'').replace(/\+/g, '%20')) || document.id(props.matchInput).get('name')});
 		},
 		test: function(element, props){
 			var eleVal = element.get('value');
@@ -5250,15 +5382,15 @@ Form.Validator.addAllThese([
 			var ccNum = element.get('value');
 			ccNum = ccNum.replace(/[^0-9]/g, '');
 
-			var valid_type = false;
+			var validType = false;
 
-			if (ccNum.test(/^4[0-9]{12}([0-9]{3})?$/)) valid_type = 'Visa';
-			else if (ccNum.test(/^5[1-5]([0-9]{14})$/)) valid_type = 'Master Card';
-			else if (ccNum.test(/^3[47][0-9]{13}$/)) valid_type = 'American Express';
-			else if (ccNum.test(/^6(?:011|5[0-9]{2})[0-9]{12}$/)) valid_type = 'Discover';
-			else if (ccNum.test(/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/)) valid_type = 'Diners Club';
+			if (ccNum.test(/^4[0-9]{12}([0-9]{3})?$/)) validType = 'Visa';
+			else if (ccNum.test(/^5[1-5]([0-9]{14})$/)) validType = 'Master Card';
+			else if (ccNum.test(/^3[47][0-9]{13}$/)) validType = 'American Express';
+			else if (ccNum.test(/^6(?:011|5[0-9]{2})[0-9]{12}$/)) validType = 'Discover';
+			else if (ccNum.test(/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/)) validType = 'Diners Club';
 
-			if (valid_type){
+			if (validType){
 				var sum = 0;
 				var cur = 0;
 
@@ -5289,9 +5421,10 @@ Form.Validator.addAllThese([
 		}
 	}]
 
-
 ]);
 
+})();
+
 /*
 ---
 
@@ -5355,7 +5488,7 @@ Form.Validator.Inline = new Class({
 
 	makeAdvice: function(className, field, error, warn){
 		var errorMsg = (warn) ? this.warningPrefix : this.errorPrefix;
-			errorMsg += (this.options.useTitles) ? field.title || error:error;
+		errorMsg += (this.options.useTitles) ? field.title || error:error;
 		var cssClass = (warn) ? 'warning-advice' : 'validation-advice';
 		var advice = this.getAdvice(className, field);
 		if (advice){
@@ -5472,10 +5605,10 @@ Form.Validator.Inline = new Class({
 
 	watchFields: function(fields){
 		fields.each(function(el){
-		if (this.options.evaluateFieldsOnBlur){
-			el.addEvent('blur', this.validationMonitor.pass([el, false, this.options.scrollToErrorsOnBlur], this));
-		}
-		if (this.options.evaluateFieldsOnChange){
+			if (this.options.evaluateFieldsOnBlur){
+				el.addEvent('blur', this.validationMonitor.pass([el, false, this.options.scrollToErrorsOnBlur], this));
+			}
+			if (this.options.evaluateFieldsOnChange){
 				el.addEvent('change', this.validationMonitor.pass([el, true, this.options.scrollToErrorsOnChange], this));
 			}
 		}, this);
@@ -5510,8 +5643,9 @@ provides: [OverText]
 
 ...
 */
+(function(){
 
-var OverText = new Class({
+var OverText = this.OverText = new Class({
 
 	Implements: [Options, Events, Class.Occlude],
 
@@ -5669,7 +5803,7 @@ var OverText = new Class({
 				try {
 					this.element.fireEvent('focus');
 					this.element.focus();
-				} catch(e){} //IE barfs if you call focus on hidden elements
+				} catch (e){} //IE barfs if you call focus on hidden elements
 			}
 		}
 		return this;
@@ -5706,6 +5840,8 @@ var OverText = new Class({
 
 });
 
+})();
+
 OverText.instances = [];
 
 Object.append(OverText, {
@@ -5856,7 +5992,8 @@ Fx.Accordion = new Class({
 		alwaysHide: false,
 		trigger: 'click',
 		initialDisplayFx: true,
-		resetHeight: true
+		resetHeight: true,
+		keepOpen: false
 	},
 
 	initialize: function(){
@@ -5978,11 +6115,13 @@ Fx.Accordion = new Class({
 		var obj = {},
 			elements = this.elements,
 			options = this.options,
-			effects = this.effects;
+			effects = this.effects,
+			keepOpen = options.keepOpen,
+			alwaysHide = options.alwaysHide;
 
 		if (useFx == null) useFx = true;
 		if (typeOf(index) == 'element') index = elements.indexOf(index);
-		if (index == this.current && !options.alwaysHide) return this;
+		if (index == this.current && !alwaysHide && !keepOpen) return this;
 
 		if (options.resetHeight){
 			var prev = elements[this.current];
@@ -5991,7 +6130,7 @@ Fx.Accordion = new Class({
 			}
 		}
 
-		if ((this.timer && options.link == 'chain') || (index === this.current && !options.alwaysHide)) return this;
+		if (this.timer && options.link == 'chain') return this;
 
 		if (this.current != null) this.previous = this.current;
 		this.current = index;
@@ -5999,16 +6138,20 @@ Fx.Accordion = new Class({
 
 		elements.each(function(el, i){
 			obj[i] = {};
-			var hide;
-			if (i != index){
-				hide = true;
-			} else if (options.alwaysHide && ((el.offsetHeight > 0 && options.height) || el.offsetWidth > 0 && options.width)){
-				hide = true;
-				this.selfHidden = true;
+			var hide, isOpen;
+			if (!keepOpen || i == index){
+				if (i == index) isOpen = (el.offsetHeight > 0 && options.height) || (el.offsetWidth > 0 && options.width);
+
+				if (i != index){
+					hide = true;
+				} else if ((alwaysHide || keepOpen) && isOpen){
+					hide = true;
+					this.selfHidden = true;
+				}
+				this.fireEvent(hide ? 'background' : 'active', [this.togglers[i], el]);
+				for (var fx in effects) obj[i][fx] = hide ? 0 : el[effects[fx]];
+				if (!useFx && !hide && options.resetHeight) obj[i].height = 'auto';
 			}
-			this.fireEvent(hide ? 'background' : 'active', [this.togglers[i], el]);
-			for (var fx in effects) obj[i][fx] = hide ? 0 : el[effects[fx]];
-			if (!useFx && !hide && options.resetHeight) obj[i].height = 'auto';
 		}, this);
 
 		this.internalChain.clearChain();
@@ -6204,7 +6347,7 @@ Fx.Scroll = new Class({
 	},
 
 	toElement: function(el, axes){
-		axes = axes ? Array.from(axes) : ['x', 'y'];
+		axes = axes ? Array.convert(axes) : ['x', 'y'];
 		var scroll = isBody(this.element) ? {x: 0, y: 0} : this.element.getScroll();
 		var position = Object.map(document.id(el).getPosition(this.element), function(value, axis){
 			return axes.contains(axis) ? value + scroll[axis] : false;
@@ -6213,7 +6356,7 @@ Fx.Scroll = new Class({
 	},
 
 	toElementEdge: function(el, axes, offset){
-		axes = axes ? Array.from(axes) : ['x', 'y'];
+		axes = axes ? Array.convert(axes) : ['x', 'y'];
 		el = document.id(el);
 		var to = {},
 			position = el.getPosition(this.element),
@@ -6239,7 +6382,7 @@ Fx.Scroll = new Class({
 	},
 
 	toElementCenter: function(el, axes, offset){
-		axes = axes ? Array.from(axes) : ['x', 'y'];
+		axes = axes ? Array.convert(axes) : ['x', 'y'];
 		el = document.id(el);
 		var to = {},
 			position = el.getPosition(this.element),
@@ -6431,7 +6574,7 @@ Element.implement({
 				slide[flag ? 'slideOut' : 'slideIn'](mode);
 				this.store('slide:flag', !flag);
 				toggle = true;
-			break;
+				break;
 			default: slide.start(how, mode);
 		}
 		if (!toggle) this.eliminate('slide:flag');
@@ -6713,221 +6856,221 @@ provides: [Keyboard]
 
 (function(){
 
-	var Keyboard = this.Keyboard = new Class({
+var Keyboard = this.Keyboard = new Class({
 
-		Extends: Events,
+	Extends: Events,
 
-		Implements: [Options],
+	Implements: [Options],
 
-		options: {/*
-			onActivate: function(){},
-			onDeactivate: function(){},*/
-			defaultEventType: 'keydown',
-			active: false,
-			manager: null,
-			events: {},
-			nonParsedEvents: ['activate', 'deactivate', 'onactivate', 'ondeactivate', 'changed', 'onchanged']
-		},
+	options: {/*
+		onActivate: function(){},
+		onDeactivate: function(){},*/
+		defaultEventType: 'keydown',
+		active: false,
+		manager: null,
+		events: {},
+		nonParsedEvents: ['activate', 'deactivate', 'onactivate', 'ondeactivate', 'changed', 'onchanged']
+	},
 
-		initialize: function(options){
-			if (options && options.manager){
-				this._manager = options.manager;
-				delete options.manager;
+	initialize: function(options){
+		if (options && options.manager){
+			this._manager = options.manager;
+			delete options.manager;
+		}
+		this.setOptions(options);
+		this._setup();
+	},
+
+	addEvent: function(type, fn, internal){
+		return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
+	},
+
+	removeEvent: function(type, fn){
+		return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
+	},
+
+	toggleActive: function(){
+		return this[this.isActive() ? 'deactivate' : 'activate']();
+	},
+
+	activate: function(instance){
+		if (instance){
+			if (instance.isActive()) return this;
+			//if we're stealing focus, store the last keyboard to have it so the relinquish command works
+			if (this._activeKB && instance != this._activeKB){
+				this.previous = this._activeKB;
+				this.previous.fireEvent('deactivate');
 			}
-			this.setOptions(options);
-			this._setup();
-		},
+			//if we're enabling a child, assign it so that events are now passed to it
+			this._activeKB = instance.fireEvent('activate');
+			Keyboard.manager.fireEvent('changed');
+		} else if (this._manager){
+			//else we're enabling ourselves, we must ask our parent to do it for us
+			this._manager.activate(this);
+		}
+		return this;
+	},
 
-		addEvent: function(type, fn, internal){
-			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
-		},
+	isActive: function(){
+		return this._manager ? (this._manager._activeKB == this) : (Keyboard.manager == this);
+	},
 
-		removeEvent: function(type, fn){
-			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
-		},
-
-		toggleActive: function(){
-			return this[this.isActive() ? 'deactivate' : 'activate']();
-		},
-
-		activate: function(instance){
-			if (instance){
-				if (instance.isActive()) return this;
-				//if we're stealing focus, store the last keyboard to have it so the relinquish command works
-				if (this._activeKB && instance != this._activeKB){
-					this.previous = this._activeKB;
-					this.previous.fireEvent('deactivate');
-				}
-				//if we're enabling a child, assign it so that events are now passed to it
-				this._activeKB = instance.fireEvent('activate');
+	deactivate: function(instance){
+		if (instance){
+			if (instance === this._activeKB){
+				this._activeKB = null;
+				instance.fireEvent('deactivate');
 				Keyboard.manager.fireEvent('changed');
-			} else if (this._manager){
-				//else we're enabling ourselves, we must ask our parent to do it for us
-				this._manager.activate(this);
 			}
-			return this;
-		},
+		} else if (this._manager){
+			this._manager.deactivate(this);
+		}
+		return this;
+	},
 
-		isActive: function(){
-			return this._manager ? (this._manager._activeKB == this) : (Keyboard.manager == this);
-		},
+	relinquish: function(){
+		if (this.isActive() && this._manager && this._manager.previous) this._manager.activate(this._manager.previous);
+		else this.deactivate();
+		return this;
+	},
 
-		deactivate: function(instance){
-			if (instance){
-				if (instance === this._activeKB){
-					this._activeKB = null;
-					instance.fireEvent('deactivate');
-					Keyboard.manager.fireEvent('changed');
-				}
-			} else if (this._manager){
-				this._manager.deactivate(this);
-			}
-			return this;
-		},
+	//management logic
+	manage: function(instance){
+		if (instance._manager) instance._manager.drop(instance);
+		this._instances.push(instance);
+		instance._manager = this;
+		if (!this._activeKB) this.activate(instance);
+		return this;
+	},
 
-		relinquish: function(){
-			if (this.isActive() && this._manager && this._manager.previous) this._manager.activate(this._manager.previous);
-			else this.deactivate();
-			return this;
-		},
+	drop: function(instance){
+		instance.relinquish();
+		this._instances.erase(instance);
+		if (this._activeKB == instance){
+			if (this.previous && this._instances.contains(this.previous)) this.activate(this.previous);
+			else this._activeKB = this._instances[0];
+		}
+		return this;
+	},
 
-		//management logic
-		manage: function(instance){
-			if (instance._manager) instance._manager.drop(instance);
-			this._instances.push(instance);
-			instance._manager = this;
-			if (!this._activeKB) this.activate(instance);
-			return this;
-		},
+	trace: function(){
+		Keyboard.trace(this);
+	},
 
-		drop: function(instance){
-			instance.relinquish();
-			this._instances.erase(instance);
-			if (this._activeKB == instance){
-				if (this.previous && this._instances.contains(this.previous)) this.activate(this.previous);
-				else this._activeKB = this._instances[0];
-			}
-			return this;
-		},
+	each: function(fn){
+		Keyboard.each(this, fn);
+	},
 
-		trace: function(){
-			Keyboard.trace(this);
-		},
+	/*
+		PRIVATE METHODS
+	*/
 
-		each: function(fn){
-			Keyboard.each(this, fn);
-		},
+	_instances: [],
 
-		/*
-			PRIVATE METHODS
-		*/
+	_disable: function(instance){
+		if (this._activeKB == instance) this._activeKB = null;
+	},
 
-		_instances: [],
+	_setup: function(){
+		this.addEvents(this.options.events);
+		//if this is the root manager, nothing manages it
+		if (Keyboard.manager && !this._manager) Keyboard.manager.manage(this);
+		if (this.options.active) this.activate();
+		else this.relinquish();
+	},
 
-		_disable: function(instance){
-			if (this._activeKB == instance) this._activeKB = null;
-		},
+	_handle: function(event, type){
+		//Keyboard.stop(event) prevents key propagation
+		if (event.preventKeyboardPropagation) return;
 
-		_setup: function(){
-			this.addEvents(this.options.events);
-			//if this is the root manager, nothing manages it
-			if (Keyboard.manager && !this._manager) Keyboard.manager.manage(this);
-			if (this.options.active) this.activate();
-			else this.relinquish();
-		},
-
-		_handle: function(event, type){
-			//Keyboard.stop(event) prevents key propagation
+		var bubbles = !!this._manager;
+		if (bubbles && this._activeKB){
+			this._activeKB._handle(event, type);
 			if (event.preventKeyboardPropagation) return;
-
-			var bubbles = !!this._manager;
-			if (bubbles && this._activeKB){
-				this._activeKB._handle(event, type);
-				if (event.preventKeyboardPropagation) return;
-			}
-			this.fireEvent(type, event);
-
-			if (!bubbles && this._activeKB) this._activeKB._handle(event, type);
 		}
+		this.fireEvent(type, event);
 
+		if (!bubbles && this._activeKB) this._activeKB._handle(event, type);
+	}
+
+});
+
+var parsed = {};
+var modifiers = ['shift', 'control', 'alt', 'meta'];
+var regex = /^(?:shift|control|ctrl|alt|meta)$/;
+
+Keyboard.parse = function(type, eventType, ignore){
+	if (ignore && ignore.contains(type.toLowerCase())) return type;
+
+	type = type.toLowerCase().replace(/^(keyup|keydown):/, function($0, $1){
+		eventType = $1;
+		return '';
 	});
 
-	var parsed = {};
-	var modifiers = ['shift', 'control', 'alt', 'meta'];
-	var regex = /^(?:shift|control|ctrl|alt|meta)$/;
+	if (!parsed[type]){
+		if (type != '+'){
+			var key, mods = {};
+			type.split('+').each(function(part){
+				if (regex.test(part)) mods[part] = true;
+				else key = part;
+			});
 
-	Keyboard.parse = function(type, eventType, ignore){
-		if (ignore && ignore.contains(type.toLowerCase())) return type;
+			mods.control = mods.control || mods.ctrl; // allow both control and ctrl
 
-		type = type.toLowerCase().replace(/^(keyup|keydown):/, function($0, $1){
-			eventType = $1;
-			return '';
-		});
+			var keys = [];
+			modifiers.each(function(mod){
+				if (mods[mod]) keys.push(mod);
+			});
 
-		if (!parsed[type]){
-		    if (type != '+'){
-				var key, mods = {};
-				type.split('+').each(function(part){
-					if (regex.test(part)) mods[part] = true;
-					else key = part;
-				});
-
-				mods.control = mods.control || mods.ctrl; // allow both control and ctrl
-
-				var keys = [];
-				modifiers.each(function(mod){
-					if (mods[mod]) keys.push(mod);
-				});
-
-				if (key) keys.push(key);
-				parsed[type] = keys.join('+');
-			} else {
-			    parsed[type] = type;
-			}
+			if (key) keys.push(key);
+			parsed[type] = keys.join('+');
+		} else {
+			parsed[type] = type;
 		}
+	}
 
-		return eventType + ':keys(' + parsed[type] + ')';
-	};
+	return eventType + ':keys(' + parsed[type] + ')';
+};
 
-	Keyboard.each = function(keyboard, fn){
-		var current = keyboard || Keyboard.manager;
-		while (current){
-			fn(current);
-			current = current._activeKB;
-		}
-	};
+Keyboard.each = function(keyboard, fn){
+	var current = keyboard || Keyboard.manager;
+	while (current){
+		fn(current);
+		current = current._activeKB;
+	}
+};
 
-	Keyboard.stop = function(event){
-		event.preventKeyboardPropagation = true;
-	};
+Keyboard.stop = function(event){
+	event.preventKeyboardPropagation = true;
+};
 
-	Keyboard.manager = new Keyboard({
-		active: true
+Keyboard.manager = new Keyboard({
+	active: true
+});
+
+Keyboard.trace = function(keyboard){
+	keyboard = keyboard || Keyboard.manager;
+	var hasConsole = window.console && console.log;
+	if (hasConsole) console.log('the following items have focus: ');
+	Keyboard.each(keyboard, function(current){
+		if (hasConsole) console.log(document.id(current.widget) || current.wiget || current);
+	});
+};
+
+var handler = function(event){
+	var keys = [];
+	modifiers.each(function(mod){
+		if (event[mod]) keys.push(mod);
 	});
 
-	Keyboard.trace = function(keyboard){
-		keyboard = keyboard || Keyboard.manager;
-		var hasConsole = window.console && console.log;
-		if (hasConsole) console.log('the following items have focus: ');
-		Keyboard.each(keyboard, function(current){
-			if (hasConsole) console.log(document.id(current.widget) || current.wiget || current);
-		});
-	};
+	if (!regex.test(event.key)) keys.push(event.key);
+	Keyboard.manager._handle(event, event.type + ':keys(' + keys.join('+') + ')');
+};
 
-	var handler = function(event){
-		var keys = [];
-		modifiers.each(function(mod){
-			if (event[mod]) keys.push(mod);
-		});
-
-		if (!regex.test(event.key)) keys.push(event.key);
-		Keyboard.manager._handle(event, event.type + ':keys(' + keys.join('+') + ')');
-	};
-
-	document.addEvents({
-		'keyup': handler,
-		'keydown': handler
-	});
+document.addEvents({
+	'keyup': handler,
+	'keydown': handler
+});
 
 })();
 
@@ -6969,7 +7112,7 @@ Keyboard.implement({
 		this._shortcuts = this._shortcuts || [];
 		this._shortcutIndex = this._shortcutIndex || {};
 
-		shortcut.getKeyboard = Function.from(this);
+		shortcut.getKeyboard = Function.convert(this);
 		shortcut.name = name;
 		this._shortcutIndex[name] = shortcut;
 		this._shortcuts.push(shortcut);
@@ -7008,7 +7151,7 @@ Keyboard.implement({
 });
 
 Keyboard.rebind = function(newKeys, shortcuts){
-	Array.from(shortcuts).each(function(shortcut){
+	Array.convert(shortcuts).each(function(shortcut){
 		shortcut.getKeyboard().removeEvent(shortcut.keys, shortcut.handler);
 		shortcut.getKeyboard().addEvent(newKeys, shortcut.handler);
 		shortcut.keys = newKeys;
@@ -7028,11 +7171,11 @@ Keyboard.getShortcut = function(name, keyboard, opts){
 	opts = opts || {};
 	var shortcuts = opts.many ? [] : null,
 		set = opts.many ? function(kb){
-				var shortcut = kb.getShortcut(name);
-				if (shortcut) shortcuts.push(shortcut);
-			} : function(kb){
-				if (!shortcuts) shortcuts = kb.getShortcut(name);
-			};
+			var shortcut = kb.getShortcut(name);
+			if (shortcut) shortcuts.push(shortcut);
+		} : function(kb){
+			if (!shortcuts) shortcuts = kb.getShortcut(name);
+		};
 	Keyboard.each(keyboard, set);
 	return shortcuts;
 };
@@ -7064,8 +7207,9 @@ provides: [HtmlTable]
 
 ...
 */
+(function(){
 
-var HtmlTable = new Class({
+var HtmlTable = this.HtmlTable = new Class({
 
 	Implements: [Options, Events, Class.Occlude],
 
@@ -7189,6 +7333,8 @@ var HtmlTable = new Class({
 
 });
 
+})();
+
 
 ['adopt', 'inject', 'wraps', 'grab', 'replaces', 'dispose'].each(function(method){
 	HtmlTable.implement(method, function(){
@@ -7325,7 +7471,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 	},
 
 	restore: function(tableState){
-		if(this.options.selectable && tableState.selectedRows){
+		if (this.options.selectable && tableState.selectedRows){
 			tableState.selectedRows.each(function(index){
 				this.selectRow(this.body.rows[index]);
 			}.bind(this));
@@ -7336,7 +7482,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 	deselectRow: function(row, _nocheck){
 		if (!this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
 
-		this.selectedRows = new Elements(Array.from(this.selectedRows).erase(row));
+		this.selectedRows = new Elements(Array.convert(this.selectedRows).erase(row));
 		row.removeClass(this.options.classRowSelected);
 		this.fireEvent('rowUnfocus', [row, this.selectedRows]);
 		this.fireEvent('stateChanged');
@@ -7437,7 +7583,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 			index += offset;
 		} else {
 			var limit = 0,
-			    count = 0;
+				count = 0;
 			if (offset > 0){
 				while (count < offset && index < this.body.rows.length -1){
 					if (this.body.rows[++index].isDisplayed()) count++;
@@ -7514,7 +7660,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 
 				var shiftHint = '';
 				if (this.options.allowMultiSelect && this.options.shiftForMultiSelect && this.options.useKeyboard){
-					shiftHint = " (Shift multi-selects).";
+					shiftHint = ' (Shift multi-selects).';
 				}
 
 				this.keyboard.addShortcuts({
@@ -7602,7 +7748,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 		thSelector: 'th'
 	},
 
-	initialize: function (){
+	initialize: function(){
 		this.previous.apply(this, arguments);
 		if (this.occluded) return this.occluded;
 		this.sorted = {index: null, dir: 1};
@@ -7685,7 +7831,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 	},
 
 	restore: function(tableState){
-		if(this.options.sortable && tableState.sortIndex){
+		if (this.options.sortable && tableState.sortIndex){
 			this.sort(tableState.sortIndex, tableState.sortReverse);
 		}
 		this.previous.apply(this, arguments);
@@ -7776,12 +7922,13 @@ HtmlTable = Class.refactor(HtmlTable, {
 			return a.value > b.value ? 1 : -1;
 		});
 
-		if (this.sorted.reverse == (parser == HtmlTable.Parsers['input-checked'])) data.reverse(true);
+		var reversed = this.sorted.reverse == (parser == HtmlTable.Parsers['input-checked']);
+		if (reversed) data.reverse(true);
 		this.setRowSort(data, pre);
 
 		if (rel) rel.grab(this.body);
 		this.fireEvent('stateChanged');
-		return this.fireEvent('sort', [this.body, this.sorted.index]);
+		return this.fireEvent('sort', [this.body, this.sorted.index, reversed ? 'asc' : 'desc']);
 	},
 
 	parseData: function(parser){
@@ -7994,8 +8141,9 @@ provides: [Scroller]
 
 ...
 */
+(function(){
 
-var Scroller = new Class({
+var Scroller = this.Scroller = new Class({
 
 	Implements: [Events, Options],
 
@@ -8056,7 +8204,7 @@ var Scroller = new Class({
 	scroll: function(){
 		var size = this.element.getSize(),
 			scroll = this.element.getScroll(),
-			pos = ((this.element != this.docBody) && (this.element != window)) ? element.getOffsets() : {x: 0, y: 0},
+			pos = ((this.element != this.docBody) && (this.element != window)) ? this.element.getOffsets() : {x: 0, y: 0},
 			scrollSize = this.element.getScrollSize(),
 			change = {x: 0, y: 0},
 			top = this.options.area.top || this.options.area,
@@ -8074,6 +8222,9 @@ var Scroller = new Class({
 
 });
 
+})();
+
+
 /*
 ---
 
@@ -8109,7 +8260,7 @@ var read = function(option, element){
 	return (option) ? (typeOf(option) == 'function' ? option(element) : element.get(option)) : '';
 };
 
-this.Tips = new Class({
+var Tips = this.Tips = new Class({
 
 	Implements: [Events, Options],
 
@@ -8134,7 +8285,8 @@ this.Tips = new Class({
 		offset: {x: 16, y: 16},
 		windowPadding: {x:0, y:0},
 		fixed: false,
-		waiAria: true
+		waiAria: true,
+		hideEmpty: false
 	},
 
 	initialize: function(){
@@ -8162,7 +8314,8 @@ this.Tips = new Class({
 			styles: {
 				position: 'absolute',
 				top: 0,
-				left: 0
+				left: 0,
+				display: 'none'
 			}
 		}).adopt(
 			new Element('div', {'class': 'tip-top'}),
@@ -8246,15 +8399,22 @@ this.Tips = new Class({
 		clearTimeout(this.timer);
 		this.timer = (function(){
 			this.container.empty();
-
+			var showTip = !this.options.hideEmpty;
 			['title', 'text'].each(function(value){
 				var content = element.retrieve('tip:' + value);
 				var div = this['_' + value + 'Element'] = new Element('div', {
-						'class': 'tip-' + value
-					}).inject(this.container);
-				if (content) this.fill(div, content);
+					'class': 'tip-' + value
+				}).inject(this.container);
+				if (content){
+					this.fill(div, content);
+					showTip = true;
+				}
 			}, this);
-			this.show(element);
+			if (showTip){
+				this.show(element);
+			} else {
+				this.hide(element);
+			}
 			this.position((this.options.fixed) ? {page: element.getPosition()} : event);
 		}).delay(this.options.showDelay, this);
 	},
@@ -8334,6 +8494,31 @@ this.Tips = new Class({
 
 })();
 
+/*
+---
+name: Locale.CH.Number
+description: Number messages for Switzerland.
+license: MIT-style license
+authors:
+  - Kim D. Jeker
+requires:
+  - Locale
+provides: [Locale.CH.Number]
+...
+*/
+
+Locale.define('CH', 'Number', {
+
+	decimal: ',',
+	group: '\'',
+
+	currency: {
+		decimal: '.',
+		suffix: ' CHF'
+	}
+
+});
+
 /*
 ---
 
@@ -8409,7 +8594,7 @@ Locale.Set.from = function(set, type){
 	locale.sets = set.sets || {};
 
 	if (set.inherits){
-		locale.inherits.locales = Array.from(set.inherits.locales);
+		locale.inherits.locales = Array.convert(set.inherits.locales);
 		locale.inherits.sets = set.inherits.sets || {};
 	}
 
@@ -8485,7 +8670,7 @@ Locale.define('af-ZA', 'Date', {
 	AM: 'VM',
 	PM: 'NM',
 	firstDayOfWeek: 1,
-   
+
 	// Date.Extras
 	ordinal: function(dayOfMonth){
 		return ((dayOfMonth > 1 && dayOfMonth < 20 && dayOfMonth != 8) || (dayOfMonth > 100 && dayOfMonth.toString().substr(-2, 1) == '1')) ? 'de' : 'ste';
@@ -8809,7 +8994,7 @@ provides: [Locale.cs-CZ.Date]
 // one -> n is 1;            1
 // few -> n in 2..4;         2-4
 // other -> everything else  0, 5-999, 1.31, 2.31, 5.31...
-var pluralize = function (n, one, few, other){
+var pluralize = function(n, one, few, other){
 	if (n == 1) return one;
 	else if (n == 2 || n == 3 || n == 4) return few;
 	else return other;
@@ -9194,6 +9379,22 @@ Locale.define('de-CH', 'FormValidator', {
 
 });
 
+/*
+---
+name: Locale.de-CH.Number
+description: Number messages for Switzerland.
+license: MIT-style license
+authors:
+  - Kim D. Jeker
+requires:
+  - Locale
+  - Locale.CH.Number
+provides: [Locale.de-CH.Number]
+...
+*/
+
+Locale.define('de-CH').inherit('CH', 'Number');
+
 /*
 ---
 
@@ -9368,38 +9569,38 @@ provides: [Locale.el-GR.Form.Validator]
 
 Locale.define('el-GR', 'FormValidator', {
 
-    required: 'Αυτό το πεδίο είναι απαραίτητο.',
-    length: 'Παρακαλούμε, εισάγετε {length} χαρακτήρες (έχετε ήδη εισάγει {elLength} χαρακτήρες).',
-    minLength: 'Παρακαλούμε, εισάγετε τουλάχιστον {minLength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
-    maxlength: 'Παρακαλούμε, εισάγετε εώς {maxlength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
-    integer: 'Παρακαλούμε, εισάγετε έναν ακέραιο αριθμό σε αυτό το πεδίο. Οι αριθμοί με δεκαδικά ψηφία (π.χ. 1.25) δεν επιτρέπονται.',
-    numeric: 'Παρακαλούμε, εισάγετε μόνο αριθμητικές τιμές σε αυτό το πεδίο (π.χ." 1 " ή " 1.1 " ή " -1 " ή " -1.1 " ).',
-    digits: 'Παρακαλούμε, χρησιμοποιήστε μόνο αριθμούς και σημεία στίξης σε αυτόν τον τομέα (π.χ. επιτρέπεται αριθμός τηλεφώνου με παύλες ή τελείες).',
-    alpha: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) σε αυτό το πεδίο. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
-    alphanum: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) ή αριθμούς (0-9) σε αυτόν τον τομέα. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
-    dateSuchAs: 'Παρακαλούμε, εισάγετε μια έγκυρη ημερομηνία, όπως {date}',
-    dateInFormatMDY: 'Παρακαλώ εισάγετε μια έγκυρη ημερομηνία, όπως ΜΜ/ΗΗ/ΕΕΕΕ (π.χ. "12/31/1999").',
-    email: 'Παρακαλούμε, εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου (π.χ. "fred@domain.com").',
-    url: 'Παρακαλούμε, εισάγετε μια έγκυρη URL διεύθυνση, όπως http://www.example.com',
-    currencyDollar: 'Παρακαλούμε, εισάγετε ένα έγκυρο ποσό σε δολλάρια (π.χ. $100.00).',
-    oneRequired: 'Παρακαλούμε, εισάγετε κάτι για τουλάχιστον ένα από αυτά τα πεδία.',
-    errorPrefix: 'Σφάλμα: ',
-    warningPrefix: 'Προσοχή: ',
+	required: 'Αυτό το πεδίο είναι απαραίτητο.',
+	length: 'Παρακαλούμε, εισάγετε {length} χαρακτήρες (έχετε ήδη εισάγει {elLength} χαρακτήρες).',
+	minLength: 'Παρακαλούμε, εισάγετε τουλάχιστον {minLength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
+	maxlength: 'Παρακαλούμε, εισάγετε εώς {maxlength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
+	integer: 'Παρακαλούμε, εισάγετε έναν ακέραιο αριθμό σε αυτό το πεδίο. Οι αριθμοί με δεκαδικά ψηφία (π.χ. 1.25) δεν επιτρέπονται.',
+	numeric: 'Παρακαλούμε, εισάγετε μόνο αριθμητικές τιμές σε αυτό το πεδίο (π.χ." 1 " ή " 1.1 " ή " -1 " ή " -1.1 " ).',
+	digits: 'Παρακαλούμε, χρησιμοποιήστε μόνο αριθμούς και σημεία στίξης σε αυτόν τον τομέα (π.χ. επιτρέπεται αριθμός τηλεφώνου με παύλες ή τελείες).',
+	alpha: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) σε αυτό το πεδίο. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
+	alphanum: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) ή αριθμούς (0-9) σε αυτόν τον τομέα. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
+	dateSuchAs: 'Παρακαλούμε, εισάγετε μια έγκυρη ημερομηνία, όπως {date}',
+	dateInFormatMDY: 'Παρακαλώ εισάγετε μια έγκυρη ημερομηνία, όπως ΜΜ/ΗΗ/ΕΕΕΕ (π.χ. "12/31/1999").',
+	email: 'Παρακαλούμε, εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου (π.χ. "fred@domain.com").',
+	url: 'Παρακαλούμε, εισάγετε μια έγκυρη URL διεύθυνση, όπως http://www.example.com',
+	currencyDollar: 'Παρακαλούμε, εισάγετε ένα έγκυρο ποσό σε δολλάρια (π.χ. $100.00).',
+	oneRequired: 'Παρακαλούμε, εισάγετε κάτι για τουλάχιστον ένα από αυτά τα πεδία.',
+	errorPrefix: 'Σφάλμα: ',
+	warningPrefix: 'Προσοχή: ',
 
-    // Form.Validator.Extras
-    noSpace: 'Δεν επιτρέπονται τα κενά σε αυτό το πεδίο.',
-    reqChkByNode: 'Δεν έχει επιλεγεί κάποιο αντικείμενο',
-    requiredChk: 'Αυτό το πεδίο είναι απαραίτητο.',
-    reqChkByName: 'Παρακαλούμε, επιλέξτε μια ετικέτα {label}.',
-    match: 'Αυτό το πεδίο πρέπει να ταιριάζει με το πεδίο {matchName}.',
-    startDate: 'η ημερομηνία έναρξης',
-    endDate: 'η ημερομηνία λήξης',
-    currentDate: 'η τρέχουσα ημερομηνία',
-    afterDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή μετά από την {label}.',
-    beforeDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή πριν από την {label}.',
-    startMonth: 'Παρακαλώ επιλέξτε ένα μήνα αρχής.',
-    sameMonth: 'Αυτές οι δύο ημερομηνίες πρέπει να έχουν τον ίδιο μήνα - θα πρέπει να αλλάξετε ή το ένα ή το άλλο',
-    creditcard: 'Ο αριθμός της πιστωτικής κάρτας δεν είναι έγκυρος. Παρακαλούμε ελέγξτε τον αριθμό και δοκιμάστε ξανά. {length} μήκος ψηφίων.'
+	// Form.Validator.Extras
+	noSpace: 'Δεν επιτρέπονται τα κενά σε αυτό το πεδίο.',
+	reqChkByNode: 'Δεν έχει επιλεγεί κάποιο αντικείμενο',
+	requiredChk: 'Αυτό το πεδίο είναι απαραίτητο.',
+	reqChkByName: 'Παρακαλούμε, επιλέξτε μια ετικέτα {label}.',
+	match: 'Αυτό το πεδίο πρέπει να ταιριάζει με το πεδίο {matchName}.',
+	startDate: 'η ημερομηνία έναρξης',
+	endDate: 'η ημερομηνία λήξης',
+	currentDate: 'η τρέχουσα ημερομηνία',
+	afterDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή μετά από την {label}.',
+	beforeDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή πριν από την {label}.',
+	startMonth: 'Παρακαλώ επιλέξτε ένα μήνα αρχής.',
+	sameMonth: 'Αυτές οι δύο ημερομηνίες πρέπει να έχουν τον ίδιο μήνα - θα πρέπει να αλλάξετε ή το ένα ή το άλλο',
+	creditcard: 'Ο αριθμός της πιστωτικής κάρτας δεν είναι έγκυρος. Παρακαλούμε ελέγξτε τον αριθμό και δοκιμάστε ξανά. {length} μήκος ψηφίων.'
 
 });
 
@@ -9632,6 +9833,57 @@ Locale.define('es-AR', 'FormValidator', {
 
 });
 
+/*
+---
+
+name: Locale.es-AR.Number
+
+description: Number messages for es Argentina.
+
+license: MIT-style license
+
+authors:
+  - Oscar Kuchuk
+
+requires:
+  - Locale
+
+provides: [Locale.es-AR.Number]
+
+...
+*/
+
+Locale.define('es-AR', 'Number', {
+
+	decimal: ',',
+	group: '.',
+
+/* 	Commented properties are the defaults for Number.format
+	decimals: 0,
+	precision: 0,
+	scientific: null,
+
+	prefix: null,
+	suffic: null,
+
+	// Negative/Currency/percentage will mixin Number
+	negative: {
+		prefix: '-'
+	},*/
+
+	currency: {
+		decimals: 2,
+		prefix: '$ '
+	}/*,
+
+	percentage: {
+		decimals: 2,
+		suffix: '%'
+	}*/
+
+});
+
+
 /*
 ---
 
@@ -10284,6 +10536,8 @@ provides: [Locale.fr-FR.Form.Validator]
 ...
 */
 
+/*eslint mootools-whitespace:0*/
+
 Locale.define('fr-FR', 'FormValidator', {
 
 	required: 'Ce champ est obligatoire.',
@@ -10592,6 +10846,8 @@ provides: [Locale.hu-HU.Form.Validator]
 ...
 */
 
+/*eslint mootools-whitespace:0*/
+
 Locale.define('hu-HU', 'FormValidator', {
 
 	required: 'A mező kitöltése kötelező.',
@@ -10718,6 +10974,8 @@ provides: [Locale.it-IT.Form.Validator]
 ...
 */
 
+/*eslint mootools-whitespace:0*/
+
 Locale.define('it-IT', 'FormValidator', {
 
 	required: 'Il campo &egrave; obbligatorio.',
@@ -10841,7 +11099,7 @@ provides: [Locale.ja-JP.Form.Validator]
 ...
 */
 
-Locale.define("ja-JP", "FormValidator", {
+Locale.define('ja-JP', 'FormValidator', {
 
 	required: '入力は必須です。',
 	minLength: '入力文字数は{minLength}以上にしてください。({length}文字)',
@@ -11135,7 +11393,9 @@ description: Form Validator messages for Norwegian.
 license: MIT-style license
 
 authors:
+  - Aaron Newton
   - Espen 'Rexxars' Hovlandsdal
+  - Ole Tøsse Kolvik
 
 requires:
   - Locale
@@ -11147,28 +11407,75 @@ provides: [Locale.no-NO.Form.Validator]
 
 Locale.define('no-NO', 'FormValidator', {
 
-	required: 'Dette feltet er påkrevd.',
-	minLength: 'Vennligst skriv inn minst {minLength} tegn (du skrev {length} tegn).',
-	maxLength: 'Vennligst skriv inn maksimalt {maxLength} tegn (du skrev {length} tegn).',
-	integer: 'Vennligst skriv inn et tall i dette feltet. Tall med desimaler (for eksempel 1,25) er ikke tillat.',
-	numeric: 'Vennligst skriv inn kun numeriske verdier i dette feltet (for eksempel "1", "1.1", "-1" eller "-1.1").',
-	digits: 'Vennligst bruk kun nummer og skilletegn i dette feltet.',
-	alpha: 'Vennligst bruk kun bokstaver (a-z) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
-	alphanum: 'Vennligst bruk kun bokstaver (a-z) eller nummer (0-9) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
-	dateSuchAs: 'Vennligst skriv inn en gyldig dato, som {date}',
-	dateInFormatMDY: 'Vennligst skriv inn en gyldig dato, i formatet MM/DD/YYYY (for eksempel "12/31/1999")',
-	email: 'Vennligst skriv inn en gyldig epost-adresse. For eksempel "espen@domene.no".',
-	url: 'Vennligst skriv inn en gyldig URL, for eksempel http://www.example.com.',
-	currencyDollar: 'Vennligst fyll ut et gyldig $ beløp. For eksempel $100.00 .',
-	oneRequired: 'Vennligst fyll ut noe i minst ett av disse feltene.',
+	required: 'Dette feltet er påkrevd.',
+	length: 'Skriv inn {length} tegn (du skrev {elLength} tegn)',
+	minLength: 'Skriv inn minst {minLength} tegn (du skrev {length} tegn).',
+	maxLength: 'Ikke skriv mer enn {maxLength} tegn (du skrev {length} tegn).',
+	integer: 'Skriv inn et tall i dette feltet. Tall med desimaler (f.eks. 1,25) er ikke tillat.',
+	numeric: 'Skriv kun inn numeriske verdier i dette feltet (f.eks. "1", "1.1", "-1" eller "-1.1").',
+	digits: 'Skriv kun nummer og skilletegn i dette feltet.',
+	alpha: 'Skriv kun bokstaver (a-å) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
+	alphanum: 'Skriv kun bokstaver (a-å) eller nummer (0-9) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
+	dateSuchAs: 'Skriv inn en gyldig dato, som f.eks. {date}',
+	dateInFormatMDY: 'Skriv inn en gyldig dato, f.eks. DD/MM/YYYY ("31/12/1999")',
+	email: 'Skriv inn en gyldig epost-adresse. F.eks. "ola.nordmann@example.com".',
+	url: 'Skriv inn en gyldig URL, f.eks. http://www.example.com.',
+	currencyDollar: 'Skriv inn et gyldig beløp. F.eks. 100,00.',
+	oneRequired: 'Minst ett av disse feltene må fylles ut.',
 	errorPrefix: 'Feil: ',
-	warningPrefix: 'Advarsel: '
+	warningPrefix: 'Advarsel: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Mellomrom er ikke tillatt i dette feltet.',
+	reqChkByNode: 'Ingen objekter er valgt.',
+	requiredChk: 'Dette feltet er påkrevd.',
+	reqChkByName: 'Velg en {label}.',
+	match: 'Dette feltet må være lik {matchName}',
+	startDate: 'startdato',
+	endDate: 'sluttdato',
+	currentDate: 'dagens dato',
+	afterDate: 'Datoen må være den samme som eller etter {label}.',
+	beforeDate: 'Datoen må være den samme som eller før {label}.',
+	startMonth: 'Velg en startmåned',
+	sameMonth: 'Datoene må være i den samme måneden - velg den ene eller den andre.',
+	creditcard: 'Kortnummeret du skrev inn er ikke gyldig. Prøv igjen. Du skrev {length} siffer.'
 
 });
 
 /*
 ---
 
+name: Locale.no-NO.Number
+
+description: Number messages for Norwegian.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+  - Martin Lundgren
+  - Ole T�sse Kolvik
+
+requires:
+  - Locale
+  - Locale.EU.Number
+
+provides: [Locale.no-NO.Number]
+
+...
+*/
+
+Locale.define('no-NO', 'Number', {
+
+	currency: {
+		prefix: 'NOK '
+	}
+
+}).inherit('EU', 'Number');
+
+/*
+---
+
 name: Locale.pl-PL.Date
 
 description: Date messages for Polish.
@@ -11534,7 +11841,7 @@ provides: [Locale.ru-RU.Date]
 // few -> n mod 10 in 2..4 and n mod 100 not in 12..14;
 // many -> n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14;
 // other -> everything else (example 3.14)
-var pluralize = function (n, one, few, many, other){
+var pluralize = function(n, one, few, many, other){
 	var modulo10 = n % 10,
 		modulo100 = n % 100;
 
@@ -11669,7 +11976,7 @@ provides: [Locale.sk-SK.Date]
 // one -> n is 1;            1
 // few -> n in 2..4;         2-4
 // other -> everything else  0, 5-999, 1.31, 2.31, 5.31...
-var pluralize = function (n, one, few, other){
+var pluralize = function(n, one, few, other){
 	if (n == 1) return one;
 	else if (n == 2 || n == 3 || n == 4) return few;
 	else return other;
@@ -12681,7 +12988,8 @@ Request.JSONP = new Class({
 			case 'object': case 'hash': data = Object.toQueryString(data);
 		}
 
-		var index = this.index = Request.JSONP.counter++;
+		var index = this.index = Request.JSONP.counter++,
+			key = 'request_' + index;
 
 		var src = options.url +
 			(options.url.test('\\?') ? '&' :'?') +
@@ -12691,7 +12999,8 @@ Request.JSONP = new Class({
 
 		if (src.length > 2083) this.fireEvent('error', src);
 
-		Request.JSONP.request_map['request_' + index] = function(){
+		Request.JSONP.request_map[key] = function(){
+			delete Request.JSONP.request_map[key];
 			this.success(arguments, index);
 		}.bind(this);
 
@@ -12712,7 +13021,7 @@ Request.JSONP = new Class({
 		return this.script;
 	},
 
-	success: function(args, index){
+	success: function(args){
 		if (!this.running) return;
 		this.clear()
 			.fireEvent('complete', args).fireEvent('success', args)
@@ -13555,7 +13864,7 @@ var URI = this.URI = new Class({
 		/*base: false*/
 	},
 
-	regex: /^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
+	regex: /^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?(\[[A-Fa-f0-9:]+\]|[^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
 	parts: ['scheme', 'user', 'password', 'host', 'port', 'directory', 'file', 'query', 'fragment'],
 	schemes: {http: 80, https: 443, ftp: 21, rtsp: 554, mms: 1755, file: 0},
 
@@ -13672,7 +13981,7 @@ URI.regs = {
 	directoryDot: /\.\/|\.$/
 };
 
-URI.base = new URI(Array.from(document.getElements('base[href]', true)).getLast(), {base: document.location});
+URI.base = new URI(Array.convert(document.getElements('base[href]', true)).getLast(), {base: document.location});
 
 String.implement({
 
@@ -13760,12 +14069,13 @@ requires:
   - Core/Element.Event
   - MooTools.More
 
-provides: [Assets]
+provides: [Assets, Asset.javascript, Asset.css, Asset.image, Asset.images]
 
 ...
 */
+;(function(){
 
-var Asset = {
+var Asset = this.Asset = {
 
 	javascript: function(source, properties){
 		if (!properties) properties = {};
@@ -13824,7 +14134,7 @@ var Asset = {
 				}
 				retries++;
 				if (!loaded && retries < timeout / 50) return setTimeout(check, 50);
-			}
+			};
 			setTimeout(check, 0);
 		}
 		return link;
@@ -13862,7 +14172,7 @@ var Asset = {
 	},
 
 	images: function(sources, options){
-		sources = Array.from(sources);
+		sources = Array.convert(sources);
 
 		var fn = function(){},
 			counter = 0;
@@ -13892,6 +14202,8 @@ var Asset = {
 
 };
 
+})();
+
 /*
 ---
 
@@ -13935,7 +14247,7 @@ var Color = this.Color = new Type('Color', function(color, type){
 			var old = color;
 			color = color.hsbToRgb();
 			color.hsb = old;
-		break;
+			break;
 		case 'hex': color = color.hexToRgb(true); break;
 	}
 	color.rgb = color.slice(0, 3);
@@ -13993,14 +14305,15 @@ Array.implement({
 
 	rgbToHsb: function(){
 		var red = this[0],
-				green = this[1],
-				blue = this[2],
-				hue = 0;
-		var max = Math.max(red, green, blue),
-				min = Math.min(red, green, blue);
-		var delta = max - min;
-		var brightness = max / 255,
-				saturation = (max != 0) ? delta / max : 0;
+			green = this[1],
+			blue = this[2],
+			hue = 0,
+			max = Math.max(red, green, blue),
+			min = Math.min(red, green, blue),
+			delta = max - min,
+			brightness = max / 255,
+			saturation = (max != 0) ? delta / max : 0;
+
 		if (saturation != 0){
 			var rr = (max - red) / delta;
 			var gr = (max - green) / delta;
@@ -14080,7 +14393,7 @@ provides: [Group]
 
 (function(){
 
-this.Group = new Class({
+var Group = this.Group = new Class({
 
 	initialize: function(){
 		this.instances = Array.flatten(arguments);
@@ -14304,8 +14617,8 @@ var Table = this.Table = function(){
 
 	this.length = 0;
 	var keys = [],
-	    values = [];
-	
+		values = [];
+
 	this.set = function(key, value){
 		var index = keys.indexOf(key);
 		if (index == -1){
@@ -14337,7 +14650,7 @@ var Table = this.Table = function(){
 	this.each = this.forEach = function(fn, bind){
 		for (var i = 0, l = this.length; i < l; i++) fn.call(bind, keys[i], values[i], this);
 	};
-	
+
 };
 
 if (this.Type) new Type('Table', Table);
diff --git a/web/views/image.php b/web/views/image.php
index 24fda06eb..6214c7b44 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -60,28 +60,28 @@ $path = null;
 
 if ( empty($_REQUEST['path']) ) {
 
-	if ( ! empty($_REQUEST['fid']) ) {
-		if ( $_REQUEST['fid'] == 'snapshot' ) {
-			$Event = new Event( $_REQUEST['eid'] );
+  if ( ! empty($_REQUEST['fid']) ) {
+    if ( $_REQUEST['fid'] == 'snapshot' ) {
+      $Event = new Event( $_REQUEST['eid'] );
       $Frame = new Frame();
       $Frame->FrameId('snapshot');
-			$path = $Event->Path().'/snapshot.jpg';
+      $path = $Event->Path().'/snapshot.jpg';
 Warning("Path to snapshot: $path");
-		} else {
+    } else {
 
-			$show = empty($_REQUEST['show']) ? 'capture' : $_REQUEST['show'];
+      $show = empty($_REQUEST['show']) ? 'capture' : $_REQUEST['show'];
 
-			if ( ! empty($_REQUEST['eid'] ) ) {
-				$Event = new Event( $_REQUEST['eid'] );
-				$Frame = Frame::find_one( array( 'EventId' => $_REQUEST['eid'], 'FrameId' => $_REQUEST['fid'] ) );
-				if ( ! $Frame ) {
-          $previousBulkFrame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND FrameId < ? AND Type='BULK' ORDER BY FrameID DESC LIMIT 1", NULL, array($_REQUEST['eid'], $_REQUEST['fid'] ) );
-          $nextBulkFrame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND FrameId > ? AND Type='BULK' ORDER BY FrameID ASC LIMIT 1", NULL, array($_REQUEST['eid'], $_REQUEST['fid'] ) );
+      if ( ! empty($_REQUEST['eid'] ) ) {
+        $Event = new Event( $_REQUEST['eid'] );
+        $Frame = Frame::find_one( array( 'EventId' => $_REQUEST['eid'], 'FrameId' => $_REQUEST['fid'] ) );
+        if ( ! $Frame ) {
+          $previousBulkFrame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND FrameId < ? ORDER BY FrameID DESC LIMIT 1", NULL, array($_REQUEST['eid'], $_REQUEST['fid'] ) );
+          $nextBulkFrame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND FrameId > ? ORDER BY FrameID ASC LIMIT 1", NULL, array($_REQUEST['eid'], $_REQUEST['fid'] ) );
           if ( $previousBulkFrame and $nextBulkFrame ) {
             $Frame = new Frame( $previousBulkFrame );
             $Frame->FrameId( $_REQUEST['fid'] );
 
-            $percentage = floor( ( $Frame->FrameId() - $previousBulkFrame['FrameId'] ) / ( $nextBulkFrame['FrameId'] / $previousBulkFrame['FrameId'] ) )/100;
+            $percentage = ($Frame->FrameId() - $previousBulkFrame['FrameId']) / ($nextBulkFrame['FrameId'] - $previousBulkFrame['FrameId']);
 
             $Frame->Delta( $previousBulkFrame['Delta'] + floor( 100* ( $nextBulkFrame['Delta'] - $previousBulkFrame['Delta'] ) * $percentage )/100 );
 Logger::Debug("Got virtual frame from Bulk Frames previous delta: " . $previousBulkFrame['Delta'] . " + nextdelta:" . $nextBulkFrame['Delta'] . ' - ' . $previousBulkFrame['Delta'] . ' * ' . $percentage );
diff --git a/web/views/view_video.php b/web/views/view_video.php
index 71063b29b..cb5707139 100644
--- a/web/views/view_video.php
+++ b/web/views/view_video.php
@@ -41,6 +41,10 @@ if ( ! empty($_REQUEST['eid'] ) ) {
   $Event = new Event( $_REQUEST['eid'] );
   $path = $Event->Path().'/'.$Event->DefaultVideo();
 	Logger::Debug("Path: $path");
+} else if ( ! empty($_REQUEST['event_id'] ) ) {
+  $Event = new Event( $_REQUEST['event_id'] );
+  $path = $Event->Path().'/'.$Event->DefaultVideo();
+	Logger::Debug("Path: $path");
 } else {
   $errorText = 'No video path';
 }