diff --git a/js/pianos4.js b/js/pianos4.js
index c3aa3a530c9251f7f842ec48824f658e622fdbc6..28903a4906f14a53b6223ef78a681d7f93e73cb9 100644
--- a/js/pianos4.js
+++ b/js/pianos4.js
@@ -88,7 +88,21 @@ function Pianos4( params )
             tutor: false
         };
     if( typeof ( params.hotSwitchPhase ) == 'undefined' )
-        params.hotSwitchPhase = false;
+        params.hotSwitchPhase = false; // This, in theory, enables one to
+                                        // activate the phase directly, without
+                                        // reload. In the current state, this
+                                        // doesn't work as the UI is created
+                                        // based on the said phase. For it to
+                                        // work, the application must be
+                                        // re-designed so that the whole UI is
+                                        // always created, and its element are
+                                        // shown/hidden based on the mode. The
+                                        // non-hotSwitchPhase is nevertheless
+                                        // still better than in PiAnoS 3 as the
+                                        // results are cached - the "reload" is
+                                        // just about deleting the pianos object
+                                        // and recreating it. No data will be
+                                        // reloaded from the server.
     if( !params.initData )
         params.initData = null;
     if( !params.linkToPhases )
@@ -215,128 +229,135 @@ function Pianos4( params )
     
     this.init = function()
     {
-        var activetools = [
-            new pianos4tooledit( {
+        var activeTools = [
+            new Pianos4ToolEdit( {
                 v3: params.v3,
-                hotkey: params.edittoolhotkey,
-                markcanhavecenter: params.markcanhavecenter
+                hotkey: params.editToolHotkey,
+                markCanHaveCenter: params.markCanHaveCenter
             } ),
         ];
         
         if( !params.v3 )
         {
-            if( params.usequalitytool )
+            if( params.useQualityTool )
             {
-                activetools.push( new pianos4toolridge( {
+                activeTools.push( new Pianos4ToolRidge( {
                     type: 'quality',
-                    intersectscript: params.intersectscript,
-                    qualitydefaultansinist: false,
-                    qualitytypeselector: 'dropdown',
+                    intersectScript: params.intersectScript,
+                    qualityDefaultAnsiNist: false,
+                    qualityTypeSelector: 'dropdown',
                 } ) );
             }
         }
         
-        activetools.push( new pianos4toolminutia( {
+        activeTools.push( new Pianos4ToolMinutia( {
             v3: params.v3,
-            autopairing: params.minutiatoolautopairing,
+            autoPairing: params.minutiaToolAutoPairing,
             phase: params.phase,
-            singleclickdeselects: params.inferedittool,
-            markcanhavecenter: params.markcanhavecenter,
+            singleClickDeselects: params.inferEditTool,
+            markCanHaveCenter: params.markCanHaveCenter,
         } ) );
-        activetools.push( new pianos4toolridge() );
+        activeTools.push( new Pianos4ToolRidge() );
         
         if( !params.v3 )
         {
-            if( params.useareatool )
-                activetools.push( new pianos4toolridge( {
+            if( params.useAreaTool )
+                activeTools.push( new Pianos4ToolRidge( {
                     type: 'area'
                 } ) );
-            if( params.usebrushtool )
-                activetools.push( new pianos4toolbrush() );
-            if( params.usecommenttool )
-                activetools.push( new pianos4toolcomment() );
-            if( params.usearctool )
-                activetools.push( new pianos4toolarc() );
-            if( params.usewcstool )
-                activetools.push( new pianos4toolridge( {
+            if( params.useBrushTool )
+                activeTools.push( new Pianos4ToolBrush() );
+            if( params.useCommentTool )
+                activeTools.push( new Pianos4ToolComment() );
+            if( params.useArcTool )
+                activeTools.push( new Pianos4ToolArc() );
+            if( params.useWCSTool )
+                activeTools.push( new Pianos4ToolRidge( {
                     type: 'wcs'
                 } ) );
-            if( params.usegrouptool )
-                activetools.push( new pianos4toolgroup() );
+            if( params.useGroupTool )
+                activeTools.push( new Pianos4ToolGroup() );
             if( params.phase != 'analysis' )
-                activetools.push( new pianos4toolpairing() );
+                activeTools.push( new Pianos4ToolPairing() );
         }
         
-        activetools.push( new pianos4toolpan( {
+        activeTools.push( new Pianos4ToolPan( {
             phase: params.phase
         } ) );
         
-        if( typeof( tps_generate ) !== "undefined" && params.phase != 'analysis' )
-            activetools.push( new pianos4tooltps() );
+        if( typeof( TPS_generate ) !== "undefined" && params.phase != 'analysis' )
+            activeTools.push( new Pianos4ToolTPS() );
         
-        activetools.push( new pianos4toolmeasure() );
+        activeTools.push( new Pianos4ToolMeasure() );
         
-        if( typeof( pianos4toolimageeditor ) !== "undefined" )
-            activetools.push( new pianos4toolimageeditor() );
+        if( typeof( Pianos4ToolImageEditor ) !== "undefined" )
+            activeTools.push( new Pianos4ToolImageEditor() );
         
         if( params.user.tutor )
         {
-            activetools.push( new pianos4toolreview() );
+            activeTools.push( new Pianos4ToolReview() );
         }
         
-        for( var tool in activetools )
+        for( var tool in activeTools )
         {
-            var tool = activetools[ tool ];
-            tools[ tool.getname() ] = tool;
+            var tool = activeTools[ tool ];
+            tools[ tool.getName() ] = tool;
         }
         
-        activetool = params.initialtool;
-        buildui();
+        activeTool = params.initialTool;
+        buildUI();
         
-        if( typeof ( params.screenresolution ) == 'object' )
+        if( typeof ( params.screenResolution ) == 'object' )
         {
-            screenresolution = calculatescreenresolution( params.screenresolution );
-        } else if( typeof ( params.screenresolution ) != 'number' )
+            screenResolution = calculateScreenResolution( params.screenResolution );
+        } else if( typeof ( params.screenResolution ) != 'number' )
         {
-            screenresolution = parsefloat( params.screenresolution );
+            screenResolution = parseFloat( params.screenResolution );
         } else
         {
-            screenresolution = params.screenresolution;
+            screenResolution = params.screenResolution;
         }
         
-        self.setzoomfit();
+        self.setZoomFit();
         
-        if( params.usehotkeys )
-            registerhotkeys();
+        if( params.useHotkeys )
+            registerHotkeys();
+        /*
+         * self.registerHandler('contextmenu', function(e) { if
+         * (skipNextContextMenu) { skipNextContextMenu = false;
+         * e.preventDefault(); return false; } });
+         */
 
-        if( params.initdata )
+        if( params.initData )
         {
-            ondataloaded( params.initdata );
-            updateui();
-        } else if( params.loadresults )
+            onDataLoaded( params.initData );
+            updateUI();
+        } else if( params.loadResults )
         {
+            // load() will call ajax() which will in turn call updateUI()
             self.load();
         } else
         {
-            onconclusionupdated( true );
-            updateui();
+            onConclusionUpdated( true ); // This will also be called after
+                                            // load()
+            updateUI();
         }
         
-        activetool = null;
-        setactivetool( params.initialtool );
+        activeTool = null;
+        setActiveTool( params.initialTool );
         
-        if( params.startswithconclusionopen )
-            toggleconclusion();
+        if( params.startsWithConclusionOpen )
+            toggleConclusion();
         
-        if( params.onexercisestartup )
-            params.onexercisestartup( self, params );
+        if( params.onExerciseStartup )
+            params.onExerciseStartup( self, params );
         
-        // preload some images from the analysis view
+        // Preload some images from the analysis view
         if( params.phase === "analysis" )
         {
             $( document ).ready( function()
             {
-                settimeout( function()
+                setTimeout( function()
                 {
                     preloader( 'css/location/main.png' );
                     preloader( params.print.href, 120, 15 );
@@ -408,9 +429,15 @@ function Pianos4( params )
             var closeButtonLabel = 'Close';
             
             var fields = getConclusionFields();
-            // This will map unanswered questions to their numbered labels to help the users answer the appropriate question(s).
-            // This mapping should make it into the 'fields' variable above but this implies refactoring, which I have no time for.
-            // TODO: merge the numbers to the fields, make the script apply numbers to the questions (they are applied in buildStatusBar() for the moment) and get rid of 'uglyMapping'
+            // This will map unanswered questions to their numbered labels
+            // to help the users answer
+            // the appropriate question(s). This mapping should make it into
+            // the 'fields' variable
+            // above but this implies refactoring, which I have no time for.
+            // TODO: merge the numbers to the fields, make the script apply
+            // numbers to the questions
+            // (they are applied in buildStatusBar() for the moment) and get
+            // rid of 'uglyMapping'
 
             if( ! params.skip_conclusion_check )
             {
@@ -793,11 +820,15 @@ function Pianos4( params )
         } else {
             action.redo();
             
-            // Cut the stack where the pointer currently is - this will loose track of all modifications that were rolled back to that point (in other words, the chain of actions available for "redo" is destroyed).
+            // Cut the stack where the pointer currently is - this will loose
+            // track of all modifications that were rolled back to that point
+            // (in other words, the chain of actions available for "redo" is
+            // destroyed).
             if( stack.length > 0 && stackPtr < stack.length - 1 )
             {
                 if( lastSaveData.stackPtr > stackPtr )
-                    // Clear the lastSaveData's stack ptr since it points to an area of the stack that has been invalidated.
+                    // Clear the lastSaveData's stack ptr since it points to an area
+                    // of the stack that has been invalidated.
                     lastSaveData.stackPtr = -1
                 stack = stack.slice( 0, stackPtr + 1 );
             }
@@ -952,8 +983,10 @@ function Pianos4( params )
         if( !params.user.tutor )
         {
             data.observations = getConclusions();
-            delete data.observations.length;
-            delete data.observations.isOK;
+            delete data.observations.length; // 'length' is set by
+                                                // getConclusions() but isn't
+                                                // actual data
+            delete data.observations.isOK; // Same remark
             delete data.observations.mandatoryOK;
         }
         
@@ -1099,6 +1132,9 @@ function Pianos4( params )
                     case 'dropdown':
                         var valueToSet = field[ 2 ] in data ? data[ field[ 2 ] ] : -1;
                         field[ 1 ].val( valueToSet );
+                        // The call above can actually fail if the dropdown does not
+                        // contain the key
+                        // that was passed in, so the assert() below makes sense.
                         assert( field[ 1 ].val() == valueToSet );
                         break;
                     case 'data':
@@ -1141,9 +1177,12 @@ function Pianos4( params )
     }
 
     // Call when the selection has changed to update the properties panel.
-    // Pass-in the view on which the latest event occurred.
-    // If null is given, clears the focus out of both views and display 'No properties to show', as if nothing was selected in the current view.
-    // Pass a boolean true value to re-use the current view with focus
+    // Pass-in the view
+    // on which the latest event occurred. If null is given, clears the focus
+    // out of both
+    // views and display 'No properties to show', as if nothing was selected in
+    // the current
+    // view. Pass a boolean true value to re-use the current view with focus
     this.onSelectionChanged = function( view )
     {
         if( typeof ( view ) == 'boolean' && view )
@@ -1159,6 +1198,8 @@ function Pianos4( params )
         if( view )
         {
             var sel = view.getSelection();
+            // log('Selection changed to');
+            // log(sel);
             
             var firstType = null;
             var multiTypes = false;
@@ -1232,6 +1273,14 @@ function Pianos4( params )
                                     ] );
                                 } catch( e )
                                 {
+                                    // May fail if the quality ID was set to
+                                    // e.g. 5 in ansi_nist mode, then the mode
+                                    // was changed to standard
+                                    // Don't print anything in this case - not
+                                    // too much harm anyway
+                                    // The actual fix will be an automated
+                                    // translation of ALL quality areas when the
+                                    // mode is changed.
                                 }
                             }
                         }
@@ -1423,6 +1472,9 @@ function Pianos4( params )
         return false;
     }
 
+    // Returns the currently logged-in user (if 'id' argument is not provided)
+    // or the user whose id is given - this user must exist within the current
+    // results working set.
     this.getUser = function( id )
     {
         if( typeof ( id ) == 'undefined' )
@@ -1492,9 +1544,13 @@ function Pianos4( params )
                         layoutObj.destroy();
                         $( 'body' ).html( '<div id="pianos" />' );
                         pianos.unregisterHandlers();
+                        // $('*').unbind();
+                        // $(document).unbind();
+                        // $(window).unbind();
                         delete pianos;
                         
-                        // Create the new instance and run it jQueryUIResetMouseWidgets();
+                        // Create the new instance and run it
+                        // jQueryUIResetMouseWidgets();
                         pianos = new Pianos4( p );
                         pianos.init();
                     }, 1 );
@@ -1685,6 +1741,7 @@ function Pianos4( params )
         
         for( var pane in layoutObj.panes )
         {
+            // var pane = layoutObj.panes[i];
             if( pane == 'center' )
                 continue;
             if( wanted )
@@ -1696,16 +1753,34 @@ function Pianos4( params )
         isFullscreen = wanted;
     }
 
-    // This functionality is a "RAII" version of $(document/window).bind() that will remember the handler so that it can be removed when the pianos.unregisterHandlers() method is called.
-    // This is because one cannot simply do a $(document).unbind() and expect things to work - jQuery UI (esp. jquery.ui.mouse) and maybe other libraries/plugins do register global, static callbacks that would be unbound, without possibility of re-registering them again.
-    // For the record, we want to unbind everything when the pianos object is destroyed/recreated, so that handlers are not registered twice.
-    // Because of this, we could either expect jQuery UI to have a reset() function of some kind - which it hasn't and will probably never have - or do the things cleanly on our end.
-    // This is the goal of this function.
+    // This functionality is a "RAII" version of $(document/window).bind() that
+    // will remember the
+    // handler so that it can be removed when the pianos.unregisterHandlers()
+    // method is called. This is because one cannot
+    // simply do a $(document).unbind() and expect things to work - jQuery UI
+    // (esp. jquery.ui.mouse) and
+    // maybe other libraries/plugins do register global, static callbacks that
+    // would be unbound, without
+    // possibility of re-registering them again. For the record, we want to
+    // unbind everything when the
+    // pianos object is destroyed/recreated, so that handlers are not registered
+    // twice. Because of this,
+    // we could either expect jQuery UI to have a reset() function of some kind
+    // - which it hasn't and will
+    // probably never have - or do the things cleanly on our end. This is the
+    // goal of this function.
     // Note:
-    // This fixes the "cannot move slider after step change" bug - this is because jquery.ui.mouse has a 'mouseup' handler that sets 'mouseHandled' to false appropriately, and would not work after the global unbind(), thus preventing any plugin that relied on the mouse to work, e.g. sliders, but also the layout, resizables, etc.
+    // This fixes the "cannot move slider after step change" bug - this is
+    // because jquery.ui.mouse
+    // has a 'mouseup' handler that sets 'mouseHandled' to false appropriately,
+    // and would not work after
+    // the global unbind(), thus preventing any plugin that relied on the mouse
+    // to work, e.g. sliders, but
+    // also the layout, resizables, etc.
     // Usage:
     // will call $(document/window).bind(event,handler) if event is a string
-    // will call $(document/window).bind(event[0], event[1], handler) if event is an array of length 2
+    // will call $(document/window).bind(event[0], event[1], handler) if event
+    // is an array of length 2
     // The second form is useful for e.g. keydown events.
     this.registerHandler = function( event, handler, isWindow )
     {
@@ -1824,10 +1899,12 @@ function Pianos4( params )
     var drawTutorSVG = null;
     var tutorData = {};
     var tutorDataReady = false;
+    // var skipNextContextMenu = false;
     
     // The zoom slider (v) goes from 0 to 100
     // The actual zoom factor (z) goes from 2% to 3200%
-    // We want a value of 100% zoom when the slider is at the middle point (v=50)
+    // We want a value of 100% zoom when the slider is at the middle point
+    // (v=50)
     // Using MATLAB to compute a quadratic logarithmic regression, i.e.
     // > v = [0,50,100]
     // > z = [2,100,3200]
@@ -1839,7 +1916,8 @@ function Pianos4( params )
     var sliderQuadRegVals = [
         -8.925742052568407e-05, 0.082703331134847, 0.693147180559945
     ];
-    // Inverse function: after c' = polyfit(Z,v,2), g(x) = c(1)*log(x)^2+c(2)*log(x)+c(3)
+    // Inverse function: after c' = polyfit(Z,v,2), g(x) =
+    // c(1)*log(x)^2+c(2)*log(x)+c(3)
     var sliderQuadRegValsInv = [
         0.223081222576626, 11.599155816038060, -8.147102196497766
     ];
@@ -1944,6 +2022,7 @@ function Pianos4( params )
             inferEditTool: params.inferEditTool,
             showModifiedMinutiae: params.showModifiedMinutiae,
             updatedMinutiaeTimestamp: params.updatedMinutiaeTimestamp,
+        // useH5Canvas: params.useBrushTool,
         } );
         allViews.push( mark );
         
@@ -1963,6 +2042,7 @@ function Pianos4( params )
                 editToolHotkey: params.editToolHotkey,
                 useOtherFeaturesLayer: params.useWCSTool,
                 inferEditTool: params.inferEditTool,
+            // useH5Canvas: params.useBrushTool,
             } );
             allViews.push( print );
             
@@ -1990,6 +2070,7 @@ function Pianos4( params )
                 spacing_open: params.layoutBorderWidth,
                 spacing_closed: params.layoutBorderWidth,
                 initClosed: params.startsFullscreen,
+            // applyDefaultStyles: true,
             },
             center: {
                 onresize: function()
@@ -2030,6 +2111,7 @@ function Pianos4( params )
                 var radio = $( '<input class="pianos4_toolbox_tool" type="radio" id="' + params.divid + '_tool_selector_' + tool.getName() + '" class="pianos4_toolbox_button" name="' + params.divid + '_tool_active"' + checked + ' />' )
                     .attr( 'title', tool.getLabel() );
                 var label = $( '<label class="pianos4_toolbox_tool" for="' + params.divid + '_tool_selector_' + tool.getName() + '" />' ).attr( 'title', tool.getLabel() );
+                // label.text(tool.getLabel());
                 radio.bind( 'click', function()
                 {
                     setActiveTool( tool.getName() );
@@ -2112,6 +2194,8 @@ function Pianos4( params )
         zoombox.append( $( '<div class="ui-widget-header" />' ).text( 'Zoom' ) );
         
         var zoomboxInner = $( '<div class="ui-widget-content" />' );
+        // var zoombox = $('<span class="">Zoom: <span
+        // class="_zoom_value">100.00</span> %</span>');
         var zoomFit = $( '<span class="pianos4_zoombox_button">Fit</span>' );
         zoomFit.button().bind( 'click', function()
         {
@@ -2156,6 +2240,7 @@ function Pianos4( params )
         
         zoomboxInner.append( zoomFit ).append( zoom11 ).append( zoom10x ).append( setup ).append( zoomSlider ).append( '<div class="pianos4_zoombox_value"><span class="_magnify_value" />x</div>' )
             .append( '<div class="pianos4_zoombox_value"><span class="_zoom_value" /> %</div>' )
+        // .append('<div>Slider: <span class="_slider_value" /></div>')
         ;
         
         zoombox.append( zoomboxInner );
@@ -2275,7 +2360,11 @@ function Pianos4( params )
         }
         
         var table = $( '<table />' );
-        table.append( $( '<thead />' ) ).append( '<tbody />' );
+        table.append( $( '<thead />' )
+        // .append($('<tr />')
+        // .append('<th>All</th><th>Name</th><th>LR</th>')
+        // )
+        ).append( '<tbody />' );
         
         $( '<div class="ui-widget-content" />' ).appendTo( panel ).append( controls ).append( $( '<div />' ).addClass( 'table_wrapper' ).append( table ) );
         
@@ -2288,7 +2377,9 @@ function Pianos4( params )
         
         history.append( $( '<div class="ui-widget-header" />' ).text( 'History' ) );
         
-        $( '<div class="ui-widget-content" />' ).appendTo( history ).append( $( '<div />' ).append( '<ol />' ));
+        $( '<div class="ui-widget-content" />' ).appendTo( history ).append( $( '<div />' ).append( '<ol />' )
+        // .append('<div />')
+        );
         
         return history;
     }
@@ -2322,6 +2413,10 @@ function Pianos4( params )
 
         if( params.phase == 'analysis' )
         {
+            // Do not show 'pairing' and 'segments' during analysis. And yes,
+            // Javascript's standard
+            // library has been defined by morons - come on, array.remove() ?
+            // Without using prototypes ?
             array_remove( l, 'pairing' );
             array_remove( l, 'segments' );
             array_remove( l, 'GC' );
@@ -2373,9 +2468,15 @@ function Pianos4( params )
                     button.addClass( params.layerOnOffHover[ 0 ] ).find( 'span' ).addClass( 'ui-icon-check' );
                 }
                 
+                // inner.append($('<div />').append(button));
                 inner.append( button );
                 
-            } )( l[ i ] );
+            } )( l[ i ] ); // Create a loop closure to add a "stack frame" -
+                            // Javascript "scopes" are functions, not blocks
+        // so the 'var i=...' statement declares a variable in the current
+        // function, regardless of the block.
+        // This trick is very well explained here:
+        // http://trephine.org/t/index.php?title=JavaScript_loop_closures
         
         layers.append( inner );
         
@@ -2460,6 +2561,8 @@ function Pianos4( params )
             }
         } else
         {
+            // undo.css('visibility','hidden');
+            // redo.css('visibility','hidden');
         }
         
         if( hasSubmit )
@@ -2508,7 +2611,9 @@ function Pianos4( params )
             } ).appendTo( tools );
         }
         
-        // jQuery gotcha: the element must be already part of the DOM for show()/hide() to function correctly with 'display' other than 'block'.
+        // jQuery gotcha: the element must be already part of the DOM for
+        // show()/hide() to function
+        // correctly with 'display' other than 'block'.
         $( '<span />' ).addClass( 'pianos4_unsaved_message _hidden' ).appendTo( tools ).text( 'Unsaved modifications' );
         
         if( params.title )
@@ -2783,10 +2888,13 @@ function Pianos4( params )
                         )
                 );
                 
-                // Approach to suitability.
-                // This field is hidden, and its value is set automatically based on the value sent by the backend.
-                // This value itself comes from the user's profile, and is quite hardcoded to 2 (value for comparison) in the various user creation functions (AppDB::createUserStub and Login with Shibboleth stuff).
-                // This exists for legacy reasons (NIJ project) but does not harm if we keep it.
+                // Approach to suitability. This field is hidden, and its value
+                // is set automatically based on the value sent by the backend.
+                // This value itself comes from the user's profile, and is quite
+                // hardcoded to 2 (value for comparison) in the various user
+                // creation functions (AppDB::createUserStub and Login with
+                // Shibboleth stuff). This exists for legacy reasons (NIJ project)
+                // but does not harm if we keep it.
                 var menu = $( '<select />' ).attr( 'id', 'pianos4_conclusion_analysis_suitability_approach' ).change( function( e )
                 {
                     onConclusionUpdated();
@@ -3030,6 +3138,7 @@ function Pianos4( params )
         tr1.append( $( '<td />' ).attr( 'rowspan', 2 ).addClass( 'pianos4_tutor_graphs' ).append( canvas ) );
         
         tutorSVG = d3.select( '.pianos4_statusbar .pianos4_tutor_graphs div' ).append( "svg:svg" )
+        // .attr("class", "chart")
         .attr( "width", canvas.width() ).attr( "height", canvas.height() );
         
         var tr2 = $( '<tr />' ).appendTo( tr1.parent() );
@@ -3102,7 +3211,8 @@ function Pianos4( params )
                         var d1 = d.comparison.decision;
                         assert( d1 >= 0 && d1 <= 2 );
                         var d2 = null;
-                        var dec = null;
+                        var dec = null; // decision combining d1 and d2, in
+                                        // [0..5]
                         if( d1 == 0 ) // exclusion
                         {
                             dec = d1;
@@ -3156,26 +3266,41 @@ function Pianos4( params )
                 progress_colors.range( [
                     '#c7c7c7', // not started -> gray
                     '#c2e699', // analysis started -> pale green
-                    '#78c679', '#78c679', // analysis completed + comparison started (same states, actually) -> light green
-                    '#31a354', '#31a354', // comparison completed + evaluation started (same states, actually) -> medium green
+                    '#78c679', '#78c679', // analysis completed + comparison
+                                            // started (same states, actually)
+                                            // -> light green
+                    '#31a354', '#31a354', // comparison completed + evaluation
+                                            // started (same states, actually)
+                                            // -> medium green
                     '#006837'
                 ] ); // evaluation completed -> dark green
                 
                 var mark_value_colors = d3.scale.ordinal();
                 mark_value_colors.range( [
                     '#c7c7c7', // gray -> unset
-                    Pianos4Constants.getConstantById( 3, Pianos4Constants.quality.standard ).color, // red -> no value
-                    Pianos4Constants.getConstantById( 1, Pianos4Constants.quality.standard ).color, // green -> suitable for ID
+                    Pianos4Constants.getConstantById( 3, Pianos4Constants.quality.standard ).color, // red
+                                                                                                    // ->
+                                                                                                    // no
+                                                                                                    // value
+                    Pianos4Constants.getConstantById( 1, Pianos4Constants.quality.standard ).color, // green
+                                                                                                    // ->
+                                                                                                    // suitable
+                                                                                                    // for
+                                                                                                    // ID
                     Pianos4Constants.getConstantById( 2, Pianos4Constants.quality.standard ).color
                 ] ); // orange -> suitable only for exclusion
                 
                 var decision_colors = d3.scale.ordinal();
                 decision_colors.range( [
                     '#c7c7c7', // gray -> unset
-                    Pianos4Constants.getConstantById( 3, Pianos4Constants.quality.standard ).color, // red -> exclusion
-                    '#175987', // darker blue -> inconclusive, leaning towards exclusion
+                    Pianos4Constants.getConstantById( 3, Pianos4Constants.quality.standard ).color, // red
+                                                                                                    // ->
+                                                                                                    // exclusion
+                    '#175987', // darker blue -> inconclusive, leaning towards
+                                // exclusion
                     '#1f77b4', // blue -> inconclusive, neutral
-                    '#2a92da', // lighter blue -> inconclusive, leaning towards identification
+                    '#2a92da', // lighter blue -> inconclusive, leaning towards
+                                // identification
                     Pianos4Constants.getConstantById( 1, Pianos4Constants.quality.standard ).color
                 ] ); // green -> identification
                 
@@ -3295,6 +3420,10 @@ function Pianos4( params )
                 }
 
                 drawTutorSVG( tr1.find( '.pianos4_tutor_graphs' ).width() );
+                // setTimeout(function() {
+                // x.range([0, 1200]);
+                // render();
+                // }, 2000);
                 onTutorDataAvailable( 'graphs', data );
             }
         }
@@ -3506,7 +3635,7 @@ function Pianos4( params )
         ], function()
         {
             self.setZoomFit();
-        } );
+        } ); // oddly enough, 'keypress' doesn't work for the home key ...
         
         self.registerHandler( [
             'keydown', 'shift+left'
@@ -3589,6 +3718,19 @@ function Pianos4( params )
 
     var onWindowSizeChanged = function( isInitial )
     {
+        /*
+         * var win = $(window); var availH = win.height() - $('#'+params.divid+'
+         * .ui-layout-north').outerHeight() - $('#'+params.divid+'
+         * .ui-layout-resizer-north').outerHeight() - $('#'+params.divid+'
+         * .ui-layout-resizer-south').outerHeight() - $('#'+params.divid+'
+         * .ui-layout-south').outerHeight() ;
+         * 
+         * var availW = win.width(); var east = $('#'+params.divid+'
+         * .ui-layout-east'); if (east.hasClass('ui-layout-pane-docked')) availW -=
+         * east.outerWidth() - $('#'+params.divid+'
+         * .ui-layout-resizer-east').outerWidth();
+         */
+
         var size = [
             $( '#' + params.divid + ' .pianos4_views' ).width(), $( '#' + params.divid + ' .pianos4_views' ).height()
         ];
@@ -3616,13 +3758,18 @@ function Pianos4( params )
                 $( '#' + params.divid + ' .pianos4_views' ).width(), $( '#' + params.divid + ' .pianos4_views' ).height()
             ];
         
-        // Adjust the zoombox so that the zoom slider expands to all the available height
+        // Adjust the zoombox so that the zoom slider expands to all the
+        // available height
         var slider = panes.zoombox.find( '.pianos4_zoombox_slider' );
         var usedByToolbox = params.showToolbox ? panes.toolbox.outerHeight() : 0;
         var usedByOptions = panes.options.outerHeight();
         var usedByFixedZoombox = panes.zoombox.outerHeight() - slider.outerHeight();
-        var avail = size[ 1 ] - usedByToolbox - usedByOptions - usedByFixedZoombox - 2; // 2px for the borders
+        var avail = size[ 1 ] - usedByToolbox - usedByOptions - usedByFixedZoombox - 2; // 2px
+                                                                                        // for
+                                                                                        // the
+                                                                                        // borders
         slider.css( 'height', avail + 'px' );
+        // log('Available for slider: '+avail);
         
         // Call the active tool's callback, if any
         var t = self.getActiveTool();
@@ -3636,12 +3783,16 @@ function Pianos4( params )
             size = [
                 $( '#' + params.divid + ' .pianos4_views' ).width(), $( '#' + params.divid + ' .pianos4_views' ).height()
             ];
-        
+        /*
+         * var rightColumn = { 'history': 0.2, 'layers': 'on', 'properties':
+         * -1.0, };
+         */
         var availH = size[ 1 ];
         var sizes = {};
         var sumOfProps = 0.0;
         
-        // Do a first loop to get the height of fixed-size items and compute the sum of proportions needed by the proportionnally-sized items.
+        // Do a first loop to get the height of fixed-size items and compute
+        // the sum of proportions needed by the proportionnally-sized items.
         for( var item in rightColumn )
         {
             assert( item in panes );
@@ -3676,7 +3827,9 @@ function Pianos4( params )
             }
         }
         
-        // A second loop handles the user-supplied-sized items: their sizes is not given by the content but by a specified value in pixels.
+        // A second loop handles the user-supplied-sized items: their sizes is
+        // not
+        // given by the content but by a specified value in pixels.
         var heightUsed = 0.0;
         for( var item in rightColumn )
         {
@@ -3690,7 +3843,8 @@ function Pianos4( params )
         }
         availH -= heightUsed;
         
-        // A third loop handles the proportionnaly-sized items: their sizes is calculated a la wxWidgets
+        // A third loop handles the proportionnaly-sized items: their sizes is
+        // calculated a la wxWidgets
         heightUsed = 0.0;
         for( var item in rightColumn )
         {
@@ -3706,6 +3860,9 @@ function Pianos4( params )
         }
         availH -= heightUsed;
         
+        // assert(availH <= 0.0); // This is only true when there is at least
+        // one growable widget
+        
         // A fourth loop finally assigns the size to all panes
         for( var item in sizes )
         {
@@ -3737,6 +3894,7 @@ function Pianos4( params )
             var size = [
                 parent.width(), Math.max( 19, sp.height() - 12 )
             ];
+            // parent.find('svg').width(size[0]).height(size[1]);
             tutorSVG.attr( 'width', size[ 0 ] ).attr( 'height', size[ 1 ] );
             if( drawTutorSVG )
                 drawTutorSVG( size[ 0 ] );
@@ -3897,6 +4055,9 @@ function Pianos4( params )
         if( stackPtr < 0 )
             ul.find( 'li:first' ).css( 'font-weight', 'bold' );
         
+        // panes.history.find('div:last').text('Stack pointer =
+        // '+stackPtr.toString());
+        
         var loading = $( '#' + params.divid + ' .pianos4_loading' );
         
         if( operations.length > 0 )
@@ -3946,10 +4107,16 @@ function Pianos4( params )
 
     var makeFloatablePane = function( pane, where )
     {
-        var container = pane;
+        // var dock = $('<button class="pianos4_pane_dockbtn" />');
+        var container = pane;// pane.find('.ui-widget-header:first');
         if( container.length == 0 )
             container = pane;
         
+        // dock.text('Dock/Float').button({icons:{primary:'ui-icon-pin-s'},text:false}).bind('click',
+        // function() { toggleFloatPane(pane, where); });
+        
+        // container.append(dock);
+        
         var container = $( '#' + params.divid + ' .ui-layout-' + where );
         return $( '<div class="ui-layout-' + where + ' ui-layout-pane-docked" />' ).append( pane );
     }
@@ -4137,7 +4304,7 @@ function Pianos4( params )
                                     'distanceThreshold', distth
                                 ] );
                             var angleth = parseFloat( angleThreshold.find( 'input' ).val() );
-                            
+                            // if (angleth > 0)
                             qsparams.push( [
                                 'angleThreshold', angleth
                             ] );
@@ -4152,7 +4319,9 @@ function Pianos4( params )
                         } );
                         var qs = qstemp.join( '&' );
                         
-                        // Primary filter to filter out minutiae that are not shown (only active for tutors)
+                        // Primary filter to filter out minutiae that are not
+                        // shown
+                        // (only active for tutors)
                         var filter_visible = null;
                         if( params.user.tutor )
                         {
@@ -4163,7 +4332,9 @@ function Pianos4( params )
                                 return visibility[ a.userid ];
                             }
                         }
-                        // Secondary filter to filter out minutiae that are already paired (not active if checkbox is unchecked)
+                        // Secondary filter to filter out minutiae that are
+                        // already paired
+                        // (not active if checkbox is unchecked)
                         var filter_unpaired = onlyUnpairedValue.attr( 'checked' ) ? function( a )
                         {
                             return !( 'pairing' in a );
@@ -4285,10 +4456,13 @@ function Pianos4( params )
     {
         assert( params.user.tutor );
         
+        // "Local static" variable (i.e. equivalent to 'static <type> <var>' in
+        // C)
         var me = panes.results.data( 'pianos4.me' );
         if( !me )
         {
-            // This serves as a cache that persists between calls to this function
+            // This serves as a cache that persists between calls to this
+            // function
             me = {
                 numUsers: 0,
                 users: {},
@@ -4313,6 +4487,10 @@ function Pianos4( params )
                 var tooltip = $( '<div />' ).addClass( 'ui-tooltip ui-widget ui-corner-all ui-widget-content' ).css( 'z-index', '1000' ).css( 'text-align', 'center' ).css( 'font-size', '0.8em' )
                     .append( $( '<div />' ).addClass( 'ui-tooltip-content' ).text( 'Results are initially hidden' ) ).append( $( '<div />' ).addClass( 'ui-tooltip-content' )
                         .text( 'Use the checkbox to show/hide them' ) )
+                    // .append($('<div />')
+                    // .css('font-size','0.8em')
+                    // .addClass('ui-tooltip-content').text('(Click to
+                    // dismiss)'))
                     .click( function()
                     {
                         if( tooltip )
@@ -4601,10 +4779,13 @@ function Pianos4( params )
                 if( next.length == 0 )
                     next = table.find( 'input[type=checkbox]:first' );
             }
-            if( next[ 0 ] == current[ 0 ] ) // only one user in the result set: current and next are necessarily the same
+            if( next[ 0 ] == current[ 0 ] ) // only one user in the result set:
+                                            // current and next are necessarily
+                                            // the same
                 return;
         } else if( checked.length == 0 )
         {
+            // current = [];
             next = backwards ? table.find( 'input[type=checkbox]:last' ) : table.find( 'input[type=checkbox]:first' );
             if( next.length == 0 ) // no elements at all in the result set
                 return;
@@ -4641,9 +4822,15 @@ function Pianos4( params )
         
         if( params.phase == 'analysis' && !params.v3 && params.defaultSuitabilityApproach )
         {
-            // auto-set the analysis conclusion approach if it was not initially present in the result set.
-            // This method has the disadvantage of forcing this approach even when the user has explicitly unset the value in the conclusions box, has saved and then reloads.
-            // (This is however a rare scenario: if the user wishes to change the approach she would select another option, rather than unsetting).
+            // auto-set the analysis conclusion approach if it was not initially
+            // present in the
+            // result set. This method has the disadvantage of forcing this
+            // approach even when
+            // the user has explicitly unset the value in the conclusions box,
+            // has saved and then
+            // reloads. (This is however a rare scenario: if the user wishes to
+            // change the approach
+            // she would select another option, rather than unsetting).
             if( !( 'observations' in data ) )
                 data.observations = {};
             if( !( 'mark-suitability-approach' in data.observations ) )
@@ -4691,6 +4878,9 @@ function Pianos4( params )
             fields.push( [
                 'dropdown', $( '#pianos4_conclusion_analysis_value' ), 'mark-value'
             ] );
+            // fields.push(['dropdown',
+            // $('#pianos4_conclusion_analysis_needed_ridges'),
+            // 'mark-needed-ridges']);
         } else if( params.phase == 'comparison' )
         {
             fields.push( [
@@ -4886,7 +5076,8 @@ function Pianos4( params )
             {
                 if( conclusions[ 'mark-suitability-approach' ] == 1 )
                 {
-                    // Using approach #1 -> show only options 0 and 1, remove previous answer if it was 2
+                    // Using approach #1 -> show only options 0 and 1, remove
+                    // previous answer if it was 2
                     if( 'mark-value' in conclusions && conclusions[ 'mark-value' ] == 2 )
                     {
                         $( '#pianos4_conclusion_analysis_value' ).val( -1 );
@@ -4897,7 +5088,8 @@ function Pianos4( params )
                     $( '#pianos4_conclusion_analysis_value option[value=2]' ).remove();
                 } else
                 {
-                    // Using approach #2 -> show all 3 options (0, 1 and 2), leave previous answer unmodified
+                    // Using approach #2 -> show all 3 options (0, 1 and 2),
+                    // leave previous answer unmodified
                     if( $( '#pianos4_conclusion_analysis_value option[value=2]' ).length == 0 )
                     {
                         $( '<option />' ).attr( 'value', 2 ).text( Pianos4Constants.getItemById( Pianos4Constants.conclusions.analysis.value, 2 ).label )
@@ -4929,7 +5121,11 @@ function Pianos4( params )
         else
             color = '#2ca02c';
         
-        // In analysis, one question is actually hidden and answered automatically - we do not want it to appear in the number of questions to be answered, so we reduce the counts by one.
+        // In analysis, one question is actually hidden and answered
+        // automatically - we do
+        // not want it to appear in the number of questions to be answered, so
+        // we reduce
+        // the counts by one.
         var numAnswered = conclusions.length;
         var numFields = fields.length;
         
@@ -5669,7 +5865,9 @@ function Pianos4( params )
             title = title[ 0 ];
         }
         
-        // Sort items by their order of appearance in the initial data, if applicable. (because not only selection matters, but ordering as well)
+        // Sort items by their order of appearance in the initial data, if
+        // applicable.
+        // (because not only selection matters, but ordering as well)
         var vs = initValue[ 0 ];
         items.sort( function( a, b )
         {
@@ -5738,6 +5936,7 @@ function Pianos4( params )
                 label.text( item.label );
                 frame.append( image );
                 frame.append( label );
+                // frame.button();
                 var button = $( '<div >' ).css( 'margin', '1em' ).css( 'display', 'inline-block' ).css( 'padding', '1em' ).addClass( 'ui-state-default ui-corner-all' ).css( 'cursor', 'pointer' )
                     .hover( function()
                     {
@@ -5866,7 +6065,8 @@ function Pianos4( params )
                             {
                                 if( ( 'status' in data && data.status == 'ok' ) || ( 'error' in data && !data.error ) )
                                 {
-                                    // Don't do anything - preferences are saved, that's what we care about
+                                    // Don't do anything - preferences are
+                                    // saved, that's what we care about
                                 } else
                                 {
                                     toastr.warning( 'Preferences could not be saved. They will last only for this session.', 'Warning', { timeout: 5000 } );
@@ -6062,13 +6262,25 @@ function Pianos4( params )
         } );
     }
 
-    // The getConclusion script returns ALL conclusions in a not-so-handy format (that is, we get the last saved AND submitted data for each step, as arrays).
-    // This function re-formats its input into a friendly object, getting rid of the non-latest step (so you get the submitted values if any, or the last saved if any, or nothing at all).
-    // This is done by the helper function findLatestResultIndex().
-    // One must not forget that the values of the questions, as stored in the database, are string representations of JSON objects.
-    // This is because the DB schema does not place any restriction on the kind of data an answer to a question has.
-    // Therefore, they are received as *strings* (even though they are transported as a JSON object of higher level), and must be decoded here to be usable directly.
-    // This is done by the helper function getStepField().
+    // The getConclusion script returns ALL conclusions in a not-so-handy format
+    // (that is, we get
+    // the last saved AND submitted data for each step, as arrays). This
+    // function re-formats its
+    // input into a friendly object, getting rid of the non-latest step (so you
+    // get the submitted
+    // values if any, or the last saved if any, or nothing at all). This is done
+    // by the helper
+    // function findLatestResultIndex().
+    // One must not forget that the values of the questions, as stored in the
+    // database, are string
+    // representations of JSON objects. This is because the DB schema does not
+    // place any restriction
+    // on the kind of data an answer to a question has. Therefore, they are
+    // received as *strings*
+    // (even though they are transported as a JSON object of higher level), and
+    // must be decoded
+    // here to be usable directly. This is done by the helper function
+    // getStepField().
     var postProcessConclusionData = function( data )
     {
         var findLatestResultIndex = function( data, step )
@@ -6265,14 +6477,30 @@ function Pianos4( params )
     // 'filters' member (this is set by the function above)
     var filterAssignment = function( a )
     {
-        // In the results sent by the server, we have several members of interest:
+        // In the results sent by the server, we have several members of
+        // interest:
         // - user: contains the user's name -> used by user filters
-        // - progress: contains the status of the assignment -> used by progress filters
-        // - observations: contains the textual observations and answers to questions at the current step (phase). This is important: in Analysis, we get analysis conclusions, and in comparison, comparison conclusions.
-        // - analysis: in comparison phase, this additionnal member (absent in analysis) contains the conclusions of the analysis phase (these are the values we obtain in the 'observations' member for this assignment in analysis mode.
-        // - comparison: same, but the other way around. Note that the server will not send this field for the moment (but nothing prevents us from assuming it will be the case in the future)
-        
-        // 'user', 'group' and 'progress' are always in the result data, so the filters can always be applied
+        // - progress: contains the status of the assignment -> used by progress
+        // filters
+        // - observations: contains the textual observations and answers to
+        // questions
+        // at the current step (phase). This is important: in Analysis,
+        // we get analysis conclusions, and in comparison, comparison
+        // conclusions.
+        // - analysis: in comparison phase, this additionnal member (absent in
+        // analysis)
+        // contains the conclusions of the analysis phase (these are the values
+        // we obtain in the 'observations' member for this assignment in
+        // analysis mode.
+        // - comparison: same, but the other way around. Note that the server
+        // will not send
+        // this field for the moment (but nothing prevents us from assuming it
+        // will
+        // be the case in the future)
+        
+        // 'user', 'group' and 'progress' are always in the result data, so the
+        // filters
+        // can always be applied
         if( 'user' in filters && filters.user.length )
             if( a.user.name.indexOf( filters.user ) < 0 )
                 return false;
@@ -6283,7 +6511,9 @@ function Pianos4( params )
             if( parseInt( a.progress.status ) < filters.progress )
                 return false;
         
-        // Where to find data for the analysis and comparison step depends on the phase being shown in the interface, as explained above.
+        // Where to find data for the analysis and comparison step depends on
+        // the phase
+        // being shown in the interface, as explained above.
         var aconcl = null, cconcl = null;
         if( params.phase == 'analysis' )
         {
@@ -6295,13 +6525,27 @@ function Pianos4( params )
             cconcl = ( 'observations' in a && 'comparison-decision' in a.observations ) ? a.observations[ 'comparison-decision' ] : -1;
         }
         
-        // Filters for the analysis and comparison decisions cannot be applied if the information is missing.
-        // We thus have to choose one of:
-        // - keep the results that do not have the information specified (e.g. if analysis filter is set to 'no value', analysis results that do not have this information are kept) (i.e. NULL => true)
-        // - discard the results (i.e. NULL => false) The second solution is more intuitive because one expects the filter to keep only those records that match, not the 'undefined' ones. Thus, if a such filter is specified, we dis
+        // Filters for the analysis and comparison decisions cannot be applied
+        // if the information
+        // is missing. We thus have to choose one of:
+        // - keep the results that do not have the information specified (e.g.
+        // if analysis filter
+        // is set to 'no value', analysis results that do not have this
+        // information are kept)
+        // (i.e. NULL => true)
+        // - discard the results (i.e. NULL => false)
+        // The second solution is more intuitive because one expects the filter
+        // to keep only those
+        // records that match, not the 'undefined' ones. Thus, if a such filter
+        // is specified, we
+        // dis
         assert( aconcl !== null && cconcl !== null );
-        if( 'analysis' in filters && filters.analysis >= 0 ) // If filter is active
-            if( aconcl < 0 || aconcl !== filters.analysis ) // If data is missing OR data does not match filter
+        if( 'analysis' in filters && filters.analysis >= 0 ) // If filter is
+                                                                // active
+            if( aconcl < 0 || aconcl !== filters.analysis ) // If data is
+                                                            // missing OR data
+                                                            // does not match
+                                                            // filter
                 return false; // discard result
         if( 'comparison' in filters && filters.comparison >= 0 )
             if( cconcl < 0 || cconcl !== filters.comparison )
@@ -6354,5 +6598,5 @@ function Pianos4( params )
             y: 0,
         },
     };
+    
 }
-