diff --git a/admin/availability.php b/admin/availability.php
index 09f23a24..db637b6c 100644
--- a/admin/availability.php
+++ b/admin/availability.php
@@ -46,7 +46,7 @@ include ("../functions/functions.xhtml.php");
 
 $css = array(
 "../include/bootstrap/css/bootstrap.min.css", 
-//"../include/bootstrap-3.3.2/css/bootstrap-theme.min.css",
+//"../include/bootstrap/css/bootstrap-theme.min.css",
 "../include/clockpicker/dist/bootstrap-clockpicker.min.css",
 "../css/custom.css"
 			);
diff --git a/admin/callrestrict.php b/admin/callrestrict.php
index 6d3d3b4a..7cd9bd8b 100644
--- a/admin/callrestrict.php
+++ b/admin/callrestrict.php
@@ -46,7 +46,7 @@ include ("../functions/functions.xhtml.php");
 
 $css = array(
 "../include/bootstrap/css/bootstrap.min.css", 
-//"../include/bootstrap-3.3.2/css/bootstrap-theme.min.css",
+//"../include/bootstrap/css/bootstrap-theme.min.css",
 //"../include/font-awesome/css/font-awesome.css",
 "../include/clockpicker/dist/bootstrap-clockpicker.min.css",
 "../css/custom.css"
diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php
index 04629512..64eb0bb5 100644
--- a/admin/questionnairelist.php
+++ b/admin/questionnairelist.php
@@ -45,7 +45,7 @@ include("../db.inc.php");
 include("../functions/functions.xhtml.php");
 
 /**
- * Input functions
+ * Display functions
  */
 include("../functions/functions.display.php");
 
@@ -55,7 +55,7 @@ include("../functions/functions.display.php");
 include("../functions/functions.input.php");
 
 /**
- * CKEditor
+ * Limesurvey functions
  */
 include("../functions/functions.limesurvey.php");
 
diff --git a/admin/quotarow.php b/admin/quotarow.php
index ce222500..bece1287 100755
--- a/admin/quotarow.php
+++ b/admin/quotarow.php
@@ -326,7 +326,7 @@ if ($questionnaire_id != false)
         {
           if (count($data) > 2)
           {
-            //one quota record per row
+            //one quota record per row,  placed in order of records sequence
           	$description = $db->quote($data[0]);
 			$completions = intval($data[1]);
           	$autoprioritise = 0;
@@ -431,7 +431,7 @@ if ($questionnaire_id != false)
       if (isset($_GET['sgqa']))
         $ssgqa = $db->qstr($_GET['sgqa']);
 
-      //select question
+      //select question + corrected question order as in questionnaire with subquestions 
   		$sql = "SELECT CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) as value, CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END, ' -> ' , CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ' : ', lq.question) END) as description, CASE WHEN $ssgqa LIKE CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) THEN 'selected=\'selected\'' ELSE '' END AS selected
 	  		FROM `" . LIME_PREFIX . "questions` AS lq
   			LEFT JOIN `" . LIME_PREFIX . "questions` AS lq2 ON ( lq2.qid = lq.parent_qid )
diff --git a/admin/shifttemplate.php b/admin/shifttemplate.php
index 58370145..7aea313a 100644
--- a/admin/shifttemplate.php
+++ b/admin/shifttemplate.php
@@ -46,7 +46,7 @@ include ("../functions/functions.xhtml.php");
 
 $css = array(
 "../include/bootstrap/css/bootstrap.min.css", 
-//"../include/bootstrap-3.3.2/css/bootstrap-theme.min.css",
+//"../include/bootstrap/css/bootstrap-theme.min.css",
 "../include/clockpicker/dist/bootstrap-clockpicker.min.css",
 "../css/custom.css"
 			);