diff --git a/src/button.js b/src/button.js
index 3eb47196..7f3703fc 100644
--- a/src/button.js
+++ b/src/button.js
@@ -1,4 +1,4 @@
-
+/*globals OpenSeadragon */
 
 (function( $ ){
 
@@ -247,7 +247,7 @@ function scheduleFade( button ) {
     window.setTimeout(function(){
         updateFade( button );
     }, 20 );
-};
+}
 
 function updateFade( button ) {
     var currentTime,
@@ -269,7 +269,7 @@ function updateFade( button ) {
             scheduleFade( button );
         }
     }
-};
+}
 
 function beginFading( button ) {
     button.shouldFade = true;
@@ -277,14 +277,14 @@ function beginFading( button ) {
     window.setTimeout( function(){ 
         scheduleFade( button );
     }, button.fadeDelay );
-};
+}
 
 function stopFading( button ) {
     button.shouldFade = false;
     if( button.imgGroup ){
         $.setElementOpacity( button.imgGroup, 1.0, true );
     }
-};
+}
 
 function inTo( button, newState ) {
 
@@ -313,7 +313,7 @@ function inTo( button, newState ) {
         }
         button.currentState = $.ButtonState.DOWN;
     }
-};
+}
 
 
 function outTo( button, newState ) {
@@ -343,7 +343,7 @@ function outTo( button, newState ) {
         beginFading( button );
         button.currentState = $.ButtonState.REST;
     }
-};
+}
 
 
 
diff --git a/src/buttongroup.js b/src/buttongroup.js
index c6a4e1d0..06b6bf49 100644
--- a/src/buttongroup.js
+++ b/src/buttongroup.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
 /**
diff --git a/src/control.js b/src/control.js
index 970e6004..76f791af 100644
--- a/src/control.js
+++ b/src/control.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
     
diff --git a/src/controldock.js b/src/controldock.js
index f5e63b0d..26c9ad4e 100644
--- a/src/controldock.js
+++ b/src/controldock.js
@@ -1,3 +1,5 @@
+/*globals OpenSeadragon */
+
 (function( $ ){
 
     //id hash for private properties;
@@ -55,8 +57,8 @@
          * @function
          */
         addControl: function ( element, anchor ) {
-            var element = $.getElement( element ),
-                div = null;
+            element = $.getElement( element );
+            var div = null;
 
             if ( getControlIndex( this, element ) >= 0 ) {
                 return;     // they're trying to add a duplicate control
@@ -87,8 +89,8 @@
                     element.style.paddingLeft = "0px";
                     element.style.paddingTop = "0px";
                     break;
-                case $.ControlAnchor.NONE:
                 default:
+                case $.ControlAnchor.NONE:
                     div = this.container;
                     element.style.margin = "0px";
                     element.style.padding = "0px";
@@ -107,8 +109,8 @@
          * @return {OpenSeadragon.ControlDock} Chainable.
          */
         removeControl: function ( element ) {
-            var element  = $.getElement( element ),
-                i        = getControlIndex( this, element );
+            element = $.getElement( element );
+            var i = getControlIndex( this, element );
             
             if ( i >= 0 ) {
                 this.controls[ i ].destroy();
@@ -179,6 +181,6 @@
         }
 
         return -1;
-    };
+    }
 
 }( OpenSeadragon ));
\ No newline at end of file
diff --git a/src/displayrectangle.js b/src/displayrectangle.js
index 8e011377..90d3d91d 100644
--- a/src/displayrectangle.js
+++ b/src/displayrectangle.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
 
@@ -21,7 +22,7 @@ $.DisplayRect = function( x, y, width, height, minLevel, maxLevel ) {
 
     this.minLevel = minLevel;
     this.maxLevel = maxLevel;
-}
+};
 
 $.extend( $.DisplayRect.prototype, $.Rect.prototype );
 
diff --git a/src/drawer.js b/src/drawer.js
index aaefe4d8..d42854f2 100644
--- a/src/drawer.js
+++ b/src/drawer.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
     
@@ -480,7 +481,7 @@ function updateViewport( drawer ) {
         // because we haven't finished drawing, so
         drawer.updateAgain = true; 
     }
-};
+}
 
 
 function updateLevel( drawer, haveDrawn, level, levelOpacity, levelVisibility, viewportTL, viewportBR, currentTime, best ){
@@ -526,7 +527,7 @@ function updateLevel( drawer, haveDrawn, level, levelOpacity, levelVisibility, v
         }
     }
     return best;
-};
+}
 
 function updateTile( drawer, drawLevel, haveDrawn, x, y, level, levelOpacity, levelVisibility, viewportCenter, numberOfTiles, currentTime, best){
     
@@ -586,7 +587,7 @@ function updateTile( drawer, drawLevel, haveDrawn, x, y, level, levelOpacity, le
     }
 
     return best;
-};
+}
 
 function getTile( x, y, level, tileSource, tilesMatrix, time, numTiles, normHeight ) {
     var xMod,
@@ -627,7 +628,7 @@ function getTile( x, y, level, tileSource, tilesMatrix, time, numTiles, normHeig
     tile.lastTouchTime = time;
 
     return tile;
-};
+}
 
 
 function loadTile( drawer, tile, time ) {
@@ -637,7 +638,7 @@ function loadTile( drawer, tile, time ) {
             onTileLoad( drawer, tile, time, image );
         }
     );
-};
+}
 
 function onTileLoad( drawer, tile, time, image ) {
     var insertionIndex,
@@ -707,7 +708,7 @@ function onTileLoad( drawer, tile, time, image ) {
 
     drawer.tilesLoaded[ insertionIndex ] = tile;
     drawer.updateAgain = true;
-};
+}
 
 
 function positionTile( tile, overlap, viewport, viewportCenter, levelVisibility ){
@@ -728,7 +729,7 @@ function positionTile( tile, overlap, viewport, viewportCenter, levelVisibility
     tile.size       = sizeC;
     tile.distance   = tileDistance;
     tile.visibility = levelVisibility;
-};
+}
 
 
 function blendTile( drawer, tile, x, y, level, levelOpacity, currentTime ){
@@ -758,13 +759,13 @@ function blendTile( drawer, tile, x, y, level, levelOpacity, currentTime ){
     }
 
     return false;
-};
+}
 
 
 function clearTiles( drawer ) {
     drawer.tilesMatrix = {};
     drawer.tilesLoaded = [];
-};
+}
 
 /**
  * @private
@@ -807,7 +808,7 @@ function providesCoverage( coverage, level, x, y ) {
         coverage[ level ][ x ][ y ] === undefined ||
         coverage[ level ][ x ][ y ] === true
     );
-};
+}
 
 /**
  * @private
@@ -827,7 +828,7 @@ function isCovered( coverage, level, x, y ) {
              providesCoverage( coverage, level + 1, 2 * x + 1, 2 * y + 1 )
         );
     }
-};
+}
 
 /**
  * @private
@@ -848,7 +849,7 @@ function setCoverage( coverage, level, x, y, covers ) {
     }
 
     coverage[ level ][ x ][ y ] = covers;
-};
+}
 
 /**
  * @private
@@ -859,7 +860,7 @@ function setCoverage( coverage, level, x, y, covers ) {
  */
 function resetCoverage( coverage, level ) {
     coverage[ level ] = {};
-};
+}
 
 /**
  * @private
@@ -876,7 +877,7 @@ function getOverlayIndex( overlays, element ) {
     }
 
     return -1;
-};
+}
 
 /**
  * @private
@@ -898,7 +899,7 @@ function compareTiles( previousBest, tile ) {
     }
 
     return previousBest;
-};
+}
 
 function finishLoadingImage( image, callback, successful, jobid ){
 
@@ -913,7 +914,7 @@ function finishLoadingImage( image, callback, successful, jobid ){
         callback( image.src, successful ? image : null);
     }, 1 );
 
-};
+}
 
 
 function drawOverlays( viewport, overlays, container ){
@@ -922,7 +923,7 @@ function drawOverlays( viewport, overlays, container ){
     for ( i = 0; i < length; i++ ) {
         drawOverlay( viewport, overlays[ i ], container );
     }
-};
+}
 
 function drawOverlay( viewport, overlay, container ){
 
@@ -935,7 +936,7 @@ function drawOverlay( viewport, overlay, container ){
         true
     );
     overlay.drawHTML( container );
-};
+}
 
 function drawTiles( drawer, lastDrawn ){
     var i, 
@@ -1023,7 +1024,7 @@ function drawTiles( drawer, lastDrawn ){
             tile.beingDrawn = true;
         }
     }
-};
+}
 
 
 function drawDebugInfo( drawer, tile, count, i ){
@@ -1082,7 +1083,7 @@ function drawDebugInfo( drawer, tile, count, i ){
             tile.position.y + 70
         );
     }
-};
+}
 
 
 }( OpenSeadragon ));
diff --git a/src/eventhandler.js b/src/eventhandler.js
index 95714ca0..02f91842 100644
--- a/src/eventhandler.js
+++ b/src/eventhandler.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function($){
 
@@ -85,7 +86,7 @@ $.EventHandler.prototype = {
 
         if ( handler ) {
             if ( !eventArgs ) {
-                eventArgs = new Object();
+                eventArgs = {};
             }
 
             handler( this, eventArgs );
diff --git a/src/legacytilesource.js b/src/legacytilesource.js
index 52cdcd6c..564c04ec 100644
--- a/src/legacytilesource.js
+++ b/src/legacytilesource.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
 
@@ -192,7 +193,7 @@ function filterFiles( files ){
         return a.height - b.height;
     });
 
-};
+}
 
 /**
  * @private
@@ -226,8 +227,8 @@ function configureFromXML( tileSource, xmlDoc ){
 
                 conf.levels .push({
                     url:    level.getAttribute( "url" ),
-                    width:  parseInt( level.getAttribute( "width" ) ),
-                    height: parseInt( level.getAttribute( "height" ) )
+                    width:  parseInt( level.getAttribute( "width" ), 10 ),
+                    height: parseInt( level.getAttribute( "height" ), 10 )
                 });
             }
 
@@ -245,7 +246,7 @@ function configureFromXML( tileSource, xmlDoc ){
     }
 
     throw new Error( 'Unknown element ' + rootName );
-};
+}
 
 /**
  * @private
@@ -256,6 +257,6 @@ function configureFromObject( tileSource, configuration ){
     
     return configuration.levels;
 
-};
+}
 
 }( OpenSeadragon ));
diff --git a/src/mousetracker.js b/src/mousetracker.js
index 7c944069..1e5e8181 100644
--- a/src/mousetracker.js
+++ b/src/mousetracker.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
         
@@ -320,7 +321,7 @@
             delegate.tracking = true;
             ACTIVE[ tracker.hash ] = tracker;
         }
-    };
+    }
 
     /**
      * Stops tracking mouse events on this element.
@@ -355,7 +356,7 @@
             delegate.tracking = false;
             delete ACTIVE[ tracker.hash ];
         }
-    };
+    }
 
     /**
      * @private
@@ -363,7 +364,7 @@
      */
     function hasMouse( tracker ) {
         return THIS[ tracker.hash ].insideElement;
-    };
+    }
 
     /**
      * Begin capturing mouse events on this element.
@@ -409,7 +410,7 @@
             }
             delegate.capturing = true;
         }
-    };
+    }
 
         
     /**
@@ -456,7 +457,7 @@
             }
             delegate.capturing = false;
         }
-    };
+    }
 
 
     /**
@@ -470,7 +471,7 @@
                 handler( ACTIVE[ otherHash ], event );
             }
         }
-    };
+    }
 
 
     /**
@@ -489,7 +490,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
 
     /**
@@ -508,7 +509,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
     
     /**
@@ -528,7 +529,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
 
     /**
@@ -575,7 +576,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
 
     /**
@@ -622,7 +623,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
 
     /**
@@ -668,7 +669,7 @@
             // add us to the list
             CAPTURING.push( tracker );   
         }
-    };
+    }
 
     /**
      * @private
@@ -698,7 +699,7 @@
         }
 
         event.preventDefault();
-    };
+    }
 
 
     /**
@@ -735,7 +736,7 @@
         if ( insideElementPress && insideElementRelease ) {
             handleMouseClick( tracker, event );
         }
-    };
+    }
 
 
     /**
@@ -757,7 +758,7 @@
             //$.console.debug("pinch end");
         }
         event.preventDefault();
-    };
+    }
 
 
     /**
@@ -794,7 +795,7 @@
         );
 
         $.stopEvent( event );
-    };
+    }
 
 
     /**
@@ -811,7 +812,7 @@
             onMouseUp( tracker, event );
         }
         releaseMouse( tracker );
-    };
+    }
 
 
     /**
@@ -822,7 +823,7 @@
         if ( tracker.clickHandler ) {
             $.cancelEvent( event );
         }
-    };
+    }
 
 
     /**
@@ -861,7 +862,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
 
     /**
@@ -894,7 +895,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
 
     /**
@@ -921,7 +922,7 @@
                 $.cancelEvent( event );
             }
         }
-    };
+    }
 
 
     /**
@@ -965,7 +966,7 @@
             }
         }
         event.preventDefault();
-    };
+    }
 
     /**
      * Only triggered once by the deepest element that initially received
@@ -983,7 +984,7 @@
         }
 
         $.stopEvent( event );
-    };
+    }
 
     /**
      * @private
@@ -991,7 +992,7 @@
      */
     function getMouseAbsolute( event ) {
         return $.getMousePosition( event );
-    };
+    }
 
     /**
     * @private
@@ -1002,7 +1003,7 @@
             offset  = $.getElementPosition( element );
 
         return mouse.minus( offset );
-    };
+    }
 
     /**
     * @private
@@ -1019,7 +1020,7 @@
             }
         }
         return elementA == elementB;
-    };
+    }
 
     /**
     * @private
@@ -1027,7 +1028,7 @@
     */
     function onGlobalMouseDown() {
         IS_BUTTON_DOWN = true;
-    };
+    }
 
     /**
     * @private
@@ -1035,7 +1036,7 @@
     */
     function onGlobalMouseUp() {
         IS_BUTTON_DOWN = false;
-    };
+    }
 
 
     (function () {
diff --git a/src/navigator.js b/src/navigator.js
index c038bd3f..c2825274 100644
--- a/src/navigator.js
+++ b/src/navigator.js
@@ -1,3 +1,5 @@
+/*globals OpenSeadragon */
+
 (function( $ ){
     
 /**
@@ -128,16 +130,18 @@ $.Navigator = function( options ){
                 case 119://w
                 case 87://W
                 case 38://up arrow
-                    shiftKey ?
-                        _this.viewer.viewport.zoomBy(1.1):
+                    if (shiftKey) 
+                        _this.viewer.viewport.zoomBy(1.1);
+                    else
                         _this.viewer.viewport.panBy(new $.Point(0, -0.05));
                     _this.viewer.viewport.applyConstraints();
                     return false;
                 case 115://s
                 case 83://S
                 case 40://down arrow
-                    shiftKey ?
-                        _this.viewer.viewport.zoomBy(0.9):
+                    if (shiftKey)
+                        _this.viewer.viewport.zoomBy(0.9);
+                    else
                         _this.viewer.viewport.panBy(new $.Point(0, 0.05));
                     _this.viewer.viewport.applyConstraints();
                     return false;
@@ -231,7 +235,7 @@ $.extend( $.Navigator.prototype, $.EventHandler.prototype, $.Viewer.prototype, {
  */
 function onCanvasClick( tracker, position, quick, shift ) {
     this.displayRegion.focus();
-};
+}
 
 
 /**
@@ -253,7 +257,7 @@ function onCanvasDrag( tracker, position, delta, shift ) {
             ) 
         );
     }
-};
+}
 
 
 /**
@@ -265,7 +269,7 @@ function onCanvasRelease( tracker, position, insideElementPress, insideElementRe
     if ( insideElementPress && this.viewer.viewport ) {
         this.viewer.viewport.applyConstraints();
     }
-};
+}
 
 
 /**
@@ -286,7 +290,7 @@ function onCanvasScroll( tracker, position, scroll, shift ) {
     }
     //cancels event
     return false;
-};
+}
 
 
 }( OpenSeadragon ));
diff --git a/src/openseadragon.js b/src/openseadragon.js
index bd33aef7..c2f2cbc6 100644
--- a/src/openseadragon.js
+++ b/src/openseadragon.js
@@ -1,3 +1,5 @@
+/*globals OpenSeadragon */
+
 /**
  * @version  OpenSeadragon @VERSION@
  *
@@ -239,7 +241,7 @@
   *
   * @returns {OpenSeadragon.Viewer}
   */
-OpenSeadragon = window.OpenSeadragon || function( options ){
+window.OpenSeadragon = window.OpenSeadragon || function( options ){
     
     return new OpenSeadragon.Viewer( options );
 
diff --git a/src/overlay.js b/src/overlay.js
index 11557bcb..c30d0fe4 100644
--- a/src/overlay.js
+++ b/src/overlay.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
 
@@ -82,8 +83,8 @@
                 case $.OverlayPlacement.LEFT:
                     position.y -= size.y / 2;
                     break;
-                case $.OverlayPlacement.CENTER:
                 default:
+                case $.OverlayPlacement.CENTER:
                     position.x -= size.x / 2;
                     position.y -= size.y / 2;
                     break;
diff --git a/src/point.js b/src/point.js
index 7dbef722..e68dee0b 100644
--- a/src/point.js
+++ b/src/point.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
 
diff --git a/src/profiler.js b/src/profiler.js
index 86debc04..d01fc19c 100644
--- a/src/profiler.js
+++ b/src/profiler.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
 
diff --git a/src/rectangle.js b/src/rectangle.js
index 0df617a6..f25eabf4 100644
--- a/src/rectangle.js
+++ b/src/rectangle.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
     
diff --git a/src/spring.js b/src/spring.js
index 2500720e..2d7b290b 100644
--- a/src/spring.js
+++ b/src/spring.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
     
@@ -105,7 +106,7 @@ $.Spring.prototype = {
                     ( this.target.time  - this.start.time )
                 );
     }
-}
+};
 
 /**
  * @private
@@ -113,6 +114,6 @@ $.Spring.prototype = {
 function transform( stiffness, x ) {
     return ( 1.0 - Math.exp( stiffness * -x ) ) / 
         ( 1.0 - Math.exp( -stiffness ) );
-};
+}
 
 }( OpenSeadragon ));
diff --git a/src/tile.js b/src/tile.js
index 09632e8c..7057987c 100644
--- a/src/tile.js
+++ b/src/tile.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
     
diff --git a/src/tilesource.js b/src/tilesource.js
index 9c8fac83..a5a5eb99 100644
--- a/src/tilesource.js
+++ b/src/tilesource.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
 
@@ -376,7 +377,7 @@ function processResponse( xhr ){
         data = responseText;
     }
     return data;
-};
+}
 
 
 /**
diff --git a/src/tilesourcecollection.js b/src/tilesourcecollection.js
index def1e571..73dbdd1a 100644
--- a/src/tilesourcecollection.js
+++ b/src/tilesourcecollection.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){
     
diff --git a/src/viewer.js b/src/viewer.js
index a0120ce3..5265b94e 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -1,3 +1,5 @@
+/*globals OpenSeadragon */
+
 (function( $ ){
      
 // dictionary from hash to private properties
@@ -575,7 +577,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
             abortControlsAutoHide( this );
         } else {
             beginControlsAutoHide( this );
-        };
+        }
     },
 
     
@@ -1058,7 +1060,7 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){
     return window.setTimeout( function(){
         updateFunc( viewer );
     }, deltaTime );
-};
+}
 
 
 //provides a sequence in the fade animation
@@ -1066,7 +1068,7 @@ function scheduleControlsFade( viewer ) {
     window.setTimeout( function(){
         updateControlsFade( viewer );
     }, 20);
-};
+}
 
 
 //initiates an animation to hide the controls
@@ -1082,7 +1084,7 @@ function beginControlsAutoHide( viewer ) {
     window.setTimeout( function(){
         scheduleControlsFade( viewer );
     }, viewer.controlsFadeDelay );
-};
+}
 
 
 //determines if fade animation is done or continues the animation
@@ -1108,7 +1110,7 @@ function updateControlsFade( viewer ) {
             scheduleControlsFade( viewer ); 
         }
     }
-};
+}
 
 
 //stop the fade animation on the controls and show them
@@ -1118,7 +1120,7 @@ function abortControlsAutoHide( viewer ) {
     for ( i = viewer.controls.length - 1; i >= 0; i-- ) {
         viewer.controls[ i ].setOpacity( 1.0 );
     }
-};
+}
 
 
 
@@ -1127,12 +1129,12 @@ function abortControlsAutoHide( viewer ) {
 ///////////////////////////////////////////////////////////////////////////////
 function onFocus(){
     abortControlsAutoHide( this );
-};
+}
 
 function onBlur(){
     beginControlsAutoHide( this );
     
-};
+}
 
 function onCanvasClick( tracker, position, quick, shift ) {
     var zoomPreClick,
@@ -1146,7 +1148,7 @@ function onCanvasClick( tracker, position, quick, shift ) {
         );
         this.viewport.applyConstraints();
     }
-};
+}
 
 function onCanvasDrag( tracker, position, delta, shift ) {
     if ( this.viewport ) {
@@ -1162,13 +1164,13 @@ function onCanvasDrag( tracker, position, delta, shift ) {
             ) 
         );
     }
-};
+}
 
 function onCanvasRelease( tracker, position, insideElementPress, insideElementRelease ) {
     if ( insideElementPress && this.viewport ) {
         this.viewport.applyConstraints();
     }
-};
+}
 
 function onCanvasScroll( tracker, position, scroll, shift ) {
     var factor;
@@ -1182,7 +1184,7 @@ function onCanvasScroll( tracker, position, scroll, shift ) {
     }
     //cancels event
     return false;
-};
+}
 
 function onContainerExit( tracker, position, buttonDownElement, buttonDownAny ) {
     if ( !buttonDownElement ) {
@@ -1191,7 +1193,7 @@ function onContainerExit( tracker, position, buttonDownElement, buttonDownAny )
             beginControlsAutoHide( this );
         }
     }
-};
+}
 
 function onContainerRelease( tracker, position, insideElementPress, insideElementRelease ) {
     if ( !insideElementRelease ) {
@@ -1200,12 +1202,12 @@ function onContainerRelease( tracker, position, insideElementPress, insideElemen
             beginControlsAutoHide( this );
         }
     }
-};
+}
 
 function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) {
     THIS[ this.hash ].mouseInside = true;
     abortControlsAutoHide( this );
-};
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1223,7 +1225,7 @@ function updateMulti( viewer ) {
     beginTime = +new Date();
     updateOnce( viewer );
     scheduleUpdate( viewer, arguments.callee, beginTime );
-};
+}
 
 function updateOnce( viewer ) {
 
@@ -1280,7 +1282,7 @@ function updateOnce( viewer ) {
     THIS[ viewer.hash ].animating = animated;
 
     //viewer.profiler.endUpdate();
-};
+}
 
 
 
@@ -1289,7 +1291,7 @@ function updateOnce( viewer ) {
 ///////////////////////////////////////////////////////////////////////////////
 function resolveUrl( prefix, url ) {
     return prefix ? prefix + url : url;
-};
+}
 
 
 
@@ -1298,7 +1300,7 @@ function beginZoomingIn() {
     THIS[ this.hash ].zoomFactor = this.zoomPerSecond;
     THIS[ this.hash ].zooming = true;
     scheduleZoom( this );
-};
+}
 
 
 function beginZoomingOut() {
@@ -1306,17 +1308,17 @@ function beginZoomingOut() {
     THIS[ this.hash ].zoomFactor = 1.0 / this.zoomPerSecond;
     THIS[ this.hash ].zooming = true;
     scheduleZoom( this );
-};
+}
 
 
 function endZooming() {
     THIS[ this.hash ].zooming = false;
-};
+}
 
 
 function scheduleZoom( viewer ) {
     window.setTimeout( $.delegate( viewer, doZoom ), 10 );
-};
+}
 
 
 function doZoom() {
@@ -1334,7 +1336,7 @@ function doZoom() {
         THIS[ this.hash ].lastZoomTime = currentTime;
         scheduleZoom( this );
     }
-};
+}
 
 
 function doSingleZoomIn() {
@@ -1345,7 +1347,7 @@ function doSingleZoomIn() {
         );
         this.viewport.applyConstraints();
     }
-};
+}
 
 
 function doSingleZoomOut() {
@@ -1356,20 +1358,20 @@ function doSingleZoomOut() {
         );
         this.viewport.applyConstraints();
     }
-};
+}
 
 
 function lightUp() {
     this.buttons.emulateEnter();
     this.buttons.emulateExit();
-};
+}
 
 
 function onHome() {
     if ( this.viewport ) {
         this.viewport.goHome();
     }
-};
+}
 
 
 function onFullPage() {
@@ -1382,19 +1384,19 @@ function onFullPage() {
     if ( this.viewport ) {
         this.viewport.applyConstraints();
     }
-};
+}
 
 
 function onPrevious(){
     var previous = THIS[ this.hash ].sequence - 1;
     this.goToPage( previous );
-};
+}
 
 
 function onNext(){
     var next = THIS[ this.hash ].sequence + 1;
     this.goToPage( next );
-};
+}
 
 
 }( OpenSeadragon ));
diff --git a/src/viewport.js b/src/viewport.js
index 28449649..a62c13ed 100644
--- a/src/viewport.js
+++ b/src/viewport.js
@@ -1,3 +1,4 @@
+/*globals OpenSeadragon */
 
 (function( $ ){