diff --git a/.gitignore b/.gitignore
index cdb45dee..4f6229f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ Homestead.json
 /public/assets/js/web3-old.js
 /public/assets/js/abi-decoder-old.js
 /node_modules
+.vscode
+.DS_Store
diff --git a/Dockerfile b/Dockerfile
index d6c0e5b3..1dd128ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,7 @@ USER www-data
 
 # Install all PHP dependencies
 RUN composer install --no-interaction
+RUN composer update shihjay2/tcpdi-merger  --no-interaction
 
 USER root
 
diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php
index e4e2d7c9..d0cff284 100644
--- a/app/Http/Controllers/ChartController.php
+++ b/app/Http/Controllers/ChartController.php
@@ -756,9 +756,11 @@ public function care_opportunities(Request $request, $type)
         $dropdown_array['items'] = $items;
         $data['panel_dropdown'] = $this->dropdown_build($dropdown_array);
         if ($type == 'prevention') {
-            $key = '48126e4e8ea3b83bc808850c713a5743';
-            $url = 'https://epssdata.ahrq.gov/';
-            $post = http_build_query([
+            $key = '48126e4e8ea3b83bc808850c713a5743'; //this is Dr. Chen's key DH
+            // $url = 'https://epssdata.ahrq.gov/'; //this may be an older url DH
+            $url = 'https://data.uspreventiveservicestaskforce.org/api/json'; //this is the one currently recommended on the uspstf web site DH
+            // $post = http_build_query([ //change from post to get DH
+            $get = http_build_query([
                 'key' => $key,
                 'age' => round($age, 0, PHP_ROUND_HALF_DOWN),
                 'sex' => $gender,
@@ -766,9 +768,9 @@ public function care_opportunities(Request $request, $type)
                 'sexuallyActive' => $row->sexuallyactive,
                 'tobacco' => $row->tobacco
             ]);
-            $cr = curl_init($url);
-            curl_setopt($cr, CURLOPT_POST, 1);
-            curl_setopt($cr, CURLOPT_POSTFIELDS, $post);
+            $cr = curl_init($url . '?' . $get);
+            // curl_setopt($cr, CURLOPT_POST, 1);  //not needed for get
+            // curl_setopt($cr, CURLOPT_POSTFIELDS, $post);  //not needed for get
             curl_setopt($cr, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($cr, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
             $data1 = curl_exec($cr);
@@ -2205,7 +2207,7 @@ public function chart_action(Request $request, $table, $action, $id, $index)
             $this->audit('Delete');
 
             // $this->api_data('delete', 'rx_list', 'rxl_id', $old_rxl_id);
-            // UMA placeholder
+            // UMA (User-managed access) placeholder
             $arr['message'] = trans('noshform.eie') . "!";
         }
         $arr['response'] = 'OK';
@@ -3076,7 +3078,7 @@ public function demographics(Request $request)
             $return .= $this->header_build($header_arr, trans('noshform.contacts'));
             foreach ($contact_arr as $key2 => $value2) {
                 if ($value2 !== '' && $value2 !== null) {
-                    $return .= '<div class="row"><div class="col-md-3"><b>' . $key2 . '</b></div><div class="col-md-8">' . $value2 . '</div></div>';
+                    $return .= '<div class="row"><div class="col-md-3"><b>' . $key2 . '</b></div><">' . $value2 . '</div></div>';
                 }
             }
             $return .= '</div></div></div>';
@@ -3090,7 +3092,7 @@ public function demographics(Request $request)
             $return .= $this->header_build($header_arr, trans('noshform.other'));
             foreach ($other_arr as $key4 => $value4) {
                 if ($value4 !== '' && $value4 !== null) {
-                    $return .= '<div class="row"><div class="col-md-3"><b>' . $key4 . '</b></div><div class="col-md-8">' . $value4 . '</div></div>';
+                    $return .= '<div class="row"><div class="col-md-3"><b>' . $key4 . '</b></div><">' . $value4 . '</div></div>';
                 }
             }
             $return .= '</div></div></div>';
@@ -3579,7 +3581,7 @@ public function encounter(Request $request, $eid, $section='s')
             'standardpsych',
             'standardpsych1'
         ];
-        $depreciated_array = [
+        $deprecated_array = [
             'standardmedical',
             'standardmedical1'
         ];
@@ -3635,8 +3637,8 @@ public function encounter(Request $request, $eid, $section='s')
         }
         if ($ros) {
             $ros_val = $ros->ros;
-            // Convert depreciated encounter type to current
-            if (in_array($encounter->encounter_template, $depreciated_array)) {
+            // Convert deprecated encounter type to current
+            if (in_array($encounter->encounter_template, $deprecated_array)) {
                 $ros_arr = $this->array_ros();
                 foreach ($ros_arr as $ros_k => $ros_v) {
                     if ($ros->{$ros_k} !== '' && $ros->{$ros_k} !== null) {
@@ -3765,8 +3767,8 @@ public function encounter(Request $request, $eid, $section='s')
                 $pe = DB::table('pe')->where('eid', '=', $eid)->first();
                 if ($pe) {
                     $pe_val = $pe->pe;
-                    // Convert depreciated encounter type to current
-                    if (in_array($encounter->encounter_template, $depreciated_array)) {
+                    // Convert deprecated encounter type to current
+                    if (in_array($encounter->encounter_template, $deprecated_array)) {
                         $pe_arr = $this->array_pe();
                         foreach ($pe_arr as $pe_k => $pe_v) {
                             if ($pe->{$pe_k} !== '' && $pe->{$pe_k} !== null) {
@@ -4945,7 +4947,7 @@ public function encounter_details(Request $request, $eid)
             $provider_arr = $this->array_providers();
             $encounter_type_arr = $this->array_encounter_type();
             if ($eid == '0') {
-                // Remove depreciated encounter types for new encounters
+                // Remove deprecated encounter types for new encounters
                 unset($encounter_type_arr['standardmedical']);
                 unset($encounter_type_arr['standardmedical1']);
             }
@@ -9005,7 +9007,7 @@ public function social_history(Request $request)
             $return .= $this->header_build($header_arr, trans('noshform.habits'));
             foreach ($habits_arr as $key2 => $value2) {
                 if ($value2 !== '' && $value2 !== null) {
-                    $return .= '<div class="col-md-3"><b>' . $key2 . '</b></div><div class="col-md-8">' . $value2 . '</div>';
+                    $return .= '<div class="col-md-3"><b>' . $key2 . '</b></div><">' . $value2 . '</div>';
                 }
             }
             $return .= '</div></div></div>';
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index ae86aacf..ae8e5db0 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -1493,8 +1493,8 @@ protected function array_encounter_type()
             'medical' => trans('noshform.medical_encounter'),
             'phone' => trans('noshform.phone_encounter'),
             'virtual' => trans('noshform.virtual_encounter'),
-            'standardmedical1' => 'Standard Medical Visit V2', // Depreciated
-            'standardmedical' => 'Standard Medical Visit V1', // Depreciated
+            'standardmedical1' => 'Standard Medical Visit V2', // deprecated
+            'standardmedical' => 'Standard Medical Visit V1', // deprecated
             'standardpsych' => trans('noshform.standardpsych'),
             'standardpsych1' => trans('noshform.standardpsych1'),
             'clinicalsupport' => trans('noshform.clinicalsupport'),
@@ -2778,16 +2778,20 @@ protected function ascvd_calc()
             if ($vitals->bp_systolic > 200) {
                 $sbp = '200';
             } elseif ($vitals->bp_systolic < 90) {
-                $spb = '90';
+                $sbp = '90';
             } else {
-                $spb = $vitals->bp_systolic;
+                $sbp = $vitals->bp_systolic;
             }
         }
         $htn = false;
         $chol = false;
         $rx = DB::table('rx_list')->where('pid', '=', Session::get('pid'))->whereNull('rxl_date_inactive')->whereNull('rxl_date_old')->get();
         if ($rx->count()) {
-            $htn_url = 'https://rxnav.nlm.nih.gov/REST/rxclass/classMembers.json?classId=N0000001616&relaSource=NDFRT&rela=may_treat';
+        //  $htn_url = 'https://rxnav.nlm.nih.gov/REST/rxclass/classMembers.json?classId=N0000001616&relaSource=NDFRT&rela=may_treat'; 
+        //  according to https://rxnav.nlm.nih.gov/RxClassIntro.html NDFRT was replaced with MEDRT in 2018. In addition MESH identifiers
+        //  like D006973 for HTN replace the NDFRT ids like N0000001616
+        //  JSON structure is the same.     
+            $htn_url = 'https://rxnav.nlm.nih.gov/REST/rxclass/classMembers.json?classId=D006973&relaSource=MEDRT&rela=may_treat';
             $htn_ch = curl_init();
             curl_setopt($htn_ch,CURLOPT_URL, $htn_url);
             curl_setopt($htn_ch,CURLOPT_FAILONERROR,1);
@@ -2801,28 +2805,36 @@ protected function ascvd_calc()
             foreach ($htn_group['drugMemberGroup']['drugMember'] as $htn_item) {
                 $htn_arr[] = strtolower($htn_item['minConcept']['name']);
             }
-            $chol_url = 'https://rxnav.nlm.nih.gov/REST/rxclass/classMembers.json?classId=N0000001592&relaSource=NDFRT&rela=may_treat';
-            $chol_ch = curl_init();
-            curl_setopt($chol_ch,CURLOPT_URL, $chol_url);
-            curl_setopt($chol_ch,CURLOPT_FAILONERROR,1);
-            curl_setopt($chol_ch,CURLOPT_FOLLOWLOCATION,1);
-            curl_setopt($chol_ch,CURLOPT_RETURNTRANSFER,1);
-            curl_setopt($chol_ch,CURLOPT_TIMEOUT, 15);
-            $chol_json = curl_exec($chol_ch);
-            curl_close($chol_ch);
-            $chol_group = json_decode($chol_json, true);
-            $chol_arr = [];
-            foreach ($chol_group['drugMemberGroup']['drugMember'] as $chol_item) {
-                $chol_arr[] = strtolower($chol_item['minConcept']['name']);
-            }
+        //     This hyperlipidemia Rx class search is replaced with a simple statin array on line 2825. 
+        //     Reason - 1) many meds which treat high cholesterol are not statins; 2) the list of statins
+        //     is pretty short.
+        //     $chol_url = 'https://rxnav.nlm.nih.gov/REST/rxclass/classMembers.json?classId=N0000001592&relaSource=NDFRT&rela=may_treat';
+        //     Handy for drug - disease NDFRT - MEDRT code lookups: https://bioportal.bioontology.org/ontologies/NDFRT?p=classes&conceptid=N0000001580
+        //     $chol_ch = curl_init();
+        //     curl_setopt($chol_ch,CURLOPT_URL, $chol_url);
+        //     curl_setopt($chol_ch,CURLOPT_FAILONERROR,1);
+        //     curl_setopt($chol_ch,CURLOPT_FOLLOWLOCATION,1);
+        //     curl_setopt($chol_ch,CURLOPT_RETURNTRANSFER,1);
+        //     curl_setopt($chol_ch,CURLOPT_TIMEOUT, 15);
+        //     $chol_json = curl_exec($chol_ch);
+        //     curl_close($chol_ch);
+        //     $chol_group = json_decode($chol_json, true);
+        //     $chol_arr = [];
+        //     foreach ($chol_group['drugMemberGroup']['drugMember'] as $chol_item) {
+        //         $chol_arr[] = strtolower($chol_item['minConcept']['name']);
+        //     }
+            $chol_arr = ['atorvastatin', 'fluvastatin', 'lovastatin', 'pitavastatin', 'pravastatin', 'rosuvastatin', 'simvastatin']; // DH
             foreach ($rx as $rx_item) {
-                $rx_name = explode(' ', $rx_item->rxl_medication);
+                $rx_full_name = $rx_item->rxl_medication; 
+                $rx_name = explode(' ', $rx_item->rxl_medication); 
                 $rx_name_first = strtolower($rx_name[0]);
                 if (in_array($rx_name_first, $htn_arr)) {
-                    $htn = true;
+                    $htn = true; // ...where $htn means 'being treated for HTN => taking antihypertensive medicine'
                 }
-                if (in_array($rx_name_first, $chol_arr)) {
-                    $chol = true;
+                foreach ($chol_arr as $ca) {
+                    if (stripos($rx_full_name, $ca) !== false) { //don't use rx_name_first! Stripos is case insensitive. 
+                        $chol = true;  // ...where $chol means 'taking a statin'
+                    }
                 }
             }
         }
@@ -2860,6 +2872,7 @@ protected function ascvd_calc()
                 'age' => $age
             ];
             $data_string = json_encode($data);
+            echo $data_string;
             $ch = curl_init($url);
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
             curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
@@ -2877,6 +2890,7 @@ protected function ascvd_calc()
                 $result_arr['message'] .= '<li>' . $missing_item . '</li>';
             }
             $result_arr['message'] .= '</ul></div>';
+            $result_arr['message'] .= '</ul></div>';
         }
         return $result_arr;
     }
@@ -8044,7 +8058,7 @@ protected function form_practiceinfo($result, $table, $id, $subtype)
         }
         if ($subtype == 'settings') {
             $encounter_type_arr = $this->array_encounter_type();
-            // Remove depreciated encounter types for new encounters
+            // Remove deprecated encounter types for new encounters
             unset($encounter_type_arr['standardmedical']);
             unset($encounter_type_arr['standardmedical1']);
             $settings_arr = [
@@ -8919,8 +8933,9 @@ protected function form_rx_list($result, $table, $id, $subtype)
             'selectpicker' => true,
             'default_value' => $rx['label']
         ];
-        // DH Removed because it causes entry in rx_list
+        // Removed because it causes error in rx_list
         // of 0000-00-00. With code commented out entry is null. 
+        // which causes problems with the Conditions list. 
         // $items[] = [ 
         //     'name' => 'rxl_date_inactive',
         //     'type' => 'hidden',
@@ -8939,6 +8954,7 @@ protected function form_rx_list($result, $table, $id, $subtype)
         ];
         // DH Removed because it causes entry in rx_list
         // of 0000-00-00. With code commented out entry is null. 
+        // Was causing problems with the Medications list. 
         // $items[] = [
         //     'name' => 'rxl_date_old',
         //     'type' => 'hidden',
diff --git a/app/Http/Controllers/CoreController.php b/app/Http/Controllers/CoreController.php
index a3cce8d9..ea3ea341 100644
--- a/app/Http/Controllers/CoreController.php
+++ b/app/Http/Controllers/CoreController.php
@@ -2253,7 +2253,7 @@ public function dashboard_t_messages(Request $request)
     public function database_export(Request $request, $track_id='')
     {
         if ($track_id !== '') {
-            File::put(public_path() . '/temp/' . $track_id, '0');
+            File::put(public_path() . '/temp/' . $track_id, '0'); // initialize the progress bar value to zero; store value in public tracking file
             ini_set('memory_limit','196M');
             ini_set('max_execution_time', 300);
             $zip_file_name = time() . '_noshexport_' . Session::get('practice_id') . '.zip';
@@ -2262,7 +2262,7 @@ public function database_export(Request $request, $track_id='')
             $zip->open($zip_file, ZipArchive::CREATE);
             $documents_dir = Storage::path('');
             $database = env('DB_DATABASE') . "_copy";
-            $connect = mysqli_connect('localhost', env('DB_USERNAME'), env('DB_PASSWORD'));
+            $connect = mysqli_connect(env('DB_HOST'), env('DB_USERNAME'), env('DB_PASSWORD'));
             if ($connect) {
                 if (mysqli_select_db($connect, $database)) {
                     $sql = "DROP DATABASE " . $database;
@@ -2270,8 +2270,9 @@ public function database_export(Request $request, $track_id='')
                 }
                 $sql = "CREATE DATABASE " . $database;
                 if (mysqli_query($connect,$sql)) {
-                    $command = "mysqldump --no-data -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " | mysql -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . $database;
+                    $command = "mysqldump --no-data -h " . env('DB_HOST') . " -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " | mysql -h " . env('DB_HOST') . " -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . $database;
                     system($command);
+                    // drop unnecessary tables
                     Schema::connection('mysql2')->drop('audit');
                     Schema::connection('mysql2')->drop('ci_sessions');
                     Schema::connection('mysql2')->drop('cpt');
@@ -2304,10 +2305,11 @@ public function database_export(Request $request, $track_id='')
                     Schema::connection('mysql2')->drop('snomed_procedure_imaging');
                     Schema::connection('mysql2')->drop('snomed_procedure_path');
                     Schema::connection('mysql2')->drop('supplements_list');
-                    File::put(public_path() . '/temp/' . $track_id, '10');
+                    File::put(public_path() . '/temp/' . $track_id, '10'); // move progress bar to 10%
                     $practiceinfo = DB::table('practiceinfo')->where('practice_id', '=', Session::get('practice_id'))->first();
                     $practiceinfo_data = (array) $practiceinfo;
                     $practiceinfo_data['practice_id'] = '1';
+                    // save practice logo
                     DB::connection('mysql2')->table('practiceinfo')->insert($practiceinfo_data);
                     if ($practiceinfo->practice_logo != '') {
                         $practice_logo_file = public_path() . '/assets/images/' . $practiceinfo->practice_logo;
@@ -2367,6 +2369,7 @@ public function database_export(Request $request, $track_id='')
                     }
                     DB::connection('mysql2')->table('orderslist')->update(['practice_id' => '1']);
                     $provider_id_arr = [];
+                    // save provider signatures
                     $providers = DB::table('providers')->where('practice_id', '=', Session::get('practice_id'))->get();
                     if ($providers->count()) {
                         foreach ($providers as $providers_row) {
@@ -2388,6 +2391,7 @@ public function database_export(Request $request, $track_id='')
                             DB::connection('mysql2')->table('procedurelist')->insert((array) $procedurelist_row);
                         }
                     }
+                    // 
                     DB::connection('mysql2')->table('procedurelist')->update(['practice_id' => '1']);
                     $received = DB::table('received')->where('practice_id', '=', Session::get('practice_id'))->get();
                     if ($received->count()) {
@@ -2402,6 +2406,7 @@ public function database_export(Request $request, $track_id='')
                         }
                     }
                     DB::connection('mysql2')->table('received')->update(['practice_id' => '1']);
+                    // backup scans
                     $scans = DB::table('scans')->where('practice_id', '=', Session::get('practice_id'))->get();
                     if ($scans->count()) {
                         foreach ($scans as $scans_row) {
@@ -2595,6 +2600,7 @@ public function database_export(Request $request, $track_id='')
                                 DB::connection('mysql2')->table('t_messages')->update(['practice_id' => '1']);
                             }
                             $rootPath = realpath($documents_dir . $pid);
+                            // backup patient documents
                             if (file_exists($rootPath)) {
                                 $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($rootPath), RecursiveIteratorIterator::SELF_FIRST);
                                 foreach ($files as $name => $file) {
@@ -2642,6 +2648,7 @@ public function database_export(Request $request, $track_id='')
                                     DB::connection('mysql2')->table('recipients')->insert((array) $recipients_row);
                                 }
                             }
+                            // backup sent faxes
                             $rootPath1 = realpath($documents_dir . 'sentfax/' . $job_id);
                             if (file_exists($rootPath1)) {
                                 $files1 = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($rootPath1), RecursiveIteratorIterator::SELF_FIRST);
@@ -2737,14 +2744,14 @@ public function database_export(Request $request, $track_id='')
                             if ($vitals) {
                                 DB::connection('mysql2')->table('vitals')->insert((array) $vitals);
                             }
-                            $i++;
-                            $percent1 = round($j/$eid_count*25) + 70;
+                            $j++;
+                            $percent = round($j/$eid_count*30) + 70;
                             File::put(public_path() . '/temp/' . $track_id, $percent);
                         }
                     }
                     $sqlfilename = time() . '_noshexport.sql';
                     $sqlfile = public_path() . '/temp/' . $sqlfilename;
-                    $command = "mysqldump -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . $database . " > " . $sqlfile;
+                    $command = "mysqldump -h " . env('DB_HOST') . " -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . $database . " > " . $sqlfile;
                     system($command);
                     if (!file_exists($sqlfile)) {
                         sleep(2);
@@ -2767,7 +2774,7 @@ public function database_export(Request $request, $track_id='')
             return response()->download($zip_file, $zip_file_name, $headers);
         } else {
             $track_id = time() . '_' . Session::get('user_id') . '_track';
-            Session::put('database_export', route('database_export', [$track_id]));
+            Session::put('database_export', route('database_export', [$track_id])); // create a session key/value signifying that a database export is in progress
             return redirect()->route('dashboard');
         }
     }
@@ -2778,7 +2785,7 @@ public function database_import(Request $request)
         ini_set('max_execution_time', 300);
         if ($request->isMethod('post')) {
             $file = $request->input('backup');
-            $command = "mysql -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $file;
+            $command = "mysql -h " . env('DB_HOST') . " -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $file;
             system($command);
             $message = trans('noshform.database_import1');
             Session::put('message_action', $message);
@@ -2836,7 +2843,7 @@ public function database_import_cloud(Request $request)
                 $sqlsearch = glob($directory . '/*_noshexport.sql');
                 if (! empty($sqlsearch)) {
                     foreach ($sqlsearch as $sqlfile) {
-                        $command = "mysql -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $sqlfile;
+                        $command = "mysql -h " . env('DB_HOST') . " -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $sqlfile;
                         system($command);
                         unlink($sqlfile);
                     }
@@ -2876,7 +2883,7 @@ public function database_import_file(Request $request)
             $directory = public_path() . '/temp';
             $file->move($directory, $file->getClientOriginalName());
             $new_file = $directory . '/' . $file->getClientOriginalName();
-            $command = "mysql -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $new_file;
+            $command = "mysql -h " . env('DB_HOST') . " -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $new_file;
             system($command);
             unlink($new_file);
             $message = trans('noshform.database_import1');
@@ -6613,7 +6620,7 @@ public function restore_backup(Request $request)
     {
         if ($request->isMethod('post')) {
             $file = $request->input('backup');
-            $command = "mysql -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $file;
+            $command = "mysql -h " . env('DB_HOST') . " -u " . env('DB_USERNAME') . " -p". env('DB_PASSWORD') . " " . env('DB_DATABASE') . " < " . $file;
             system($command);
             // Do migrations if needed
             $migrate = new Process(["php artisan migrate --force"]);
@@ -6968,7 +6975,7 @@ public function setup(Request $request, $practice_id='0')
                 trans('noshform.patient_portal') => $result->patient_portal
             ];
             $encounter_type_arr = $this->array_encounter_type();
-            // Remove depreciated encounter types for new encounters
+            // Remove deprecated encounter types for new encounters
             unset($encounter_type_arr['standardmedical']);
             unset($encounter_type_arr['standardmedical1']);
             $reminder_interval_arr = $this->array_reminder_interval();
diff --git a/app/Http/Controllers/LoginController.php b/app/Http/Controllers/LoginController.php
index 2b25e52c..17fa2e56 100644
--- a/app/Http/Controllers/LoginController.php
+++ b/app/Http/Controllers/LoginController.php
@@ -1342,7 +1342,7 @@ public function transactions(Request $request)
     }
 
 
-    // Patient-centric, UMA login
+    // Patient-centric, UMA (User-managed accesd) login
     public function uma_auth()
     {
         $practice = DB::table('practiceinfo')->where('practice_id', '=', '1')->first();
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index 3aa15f8d..72d61373 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -12,6 +12,13 @@ class EncryptCookies extends BaseEncrypter
      * @var array
      */
     protected $except = [
-        //
+        // This is needed to allow modals to gracefully disappear after file downloads. 
+        // Laravel automatically hashes cookie values. 
+        // For jquery.fileDownload.js to work properly you need to return a cookie fileDownload=true.
+        // You don't want 'true' encrypted. 
+        // Without this the the cookie is fileDownload=a_very_long_jumble_of_characters
+        // and the fileDownload successCallback will not trigger 
+        // leaving your modal open after the download is complete. 
+        'fileDownload',
     ];
 }
diff --git a/composer.json b/composer.json
index b2c11b73..e5ee8912 100644
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,12 @@
 			"role": "Developer"
 		}
 	],
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/dhes/tcpdi-merger"
+        }
+    ],
     "require": {
         "php": ">=5.5.9",
         "adci/full-name-parser": "^0.2.4",
@@ -35,7 +41,7 @@
         "phpseclib/phpseclib": "~2.0",
         "pragmarx/countries": "^0.7",
         "shihjay2/openid-connect-uma-php": "dev-master",
-        "shihjay2/tcpdi-merger": "dev-master",
+        "shihjay2/tcpdi-merger": "dev-bugfix", 
         "simplesoftwareio/simple-qrcode": "~1.4",
         "soapbox/laravel-formatter": "2.x",
         "symfony/yaml": "^5.2",
diff --git a/config/app.php b/config/app.php
index 095dc652..b4d938ff 100644
--- a/config/app.php
+++ b/config/app.php
@@ -29,7 +29,7 @@
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => env('APP_DEBUG', true),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index 4f2eced6..a59635bd 100644
--- a/readme.md
+++ b/readme.md
@@ -17,7 +17,7 @@ mysql, imap, mcrypt, imagick, gd, cli, curl, soap, pear
 ##### 8. cURL
 
 ## Installation
-Installing NOSH ChartingSystem is easy to install if you run [Docker NOSH](https://github.com/shihjay2/docker-nosh).  NOSH and all its dependencies are already configured and installed properly.  Just deploy the Vagrant virtual machine and you're ready to start.  The previous method through Ubuntu Linux PPA's is now depreciated.  If you have access to a terminal shell for your server (any distro for Linux or Mac OS-X), you can [install NOSH](https://github.com/shihjay2/nosh2/wiki/Installation).  
+Installing NOSH ChartingSystem is easy to install if you run [Docker NOSH](https://github.com/shihjay2/docker-nosh).  NOSH and all its dependencies are already configured and installed properly.  Just deploy the Vagrant virtual machine and you're ready to start.  The previous method through Ubuntu Linux PPA's is now deprecated.  If you have access to a terminal shell for your server (any distro for Linux or Mac OS-X), you can [install NOSH](https://github.com/shihjay2/nosh2/wiki/Installation).  
 The installation script automatically adds scheduled task commands (cron files) and web server configuration files to make NOSH
 work seamlessly the first time.  The script also determines if your system meets all the package dependencies before installation.
 For detailed information, go to the [Wiki link](https://github.com/shihjay2/nosh2/wiki/Installation).
@@ -35,16 +35,16 @@ NOSH version at your fingertips!
 
 ## Update Notes for Version 2.0:
 ##### 1. Phaxio is now the only supported fax program.
-##### 2. Standard Medical Templates v1 and v2 are now depreciated and replaced my Medical Template
+##### 2. Standard Medical Templates v1 and v2 are now deprecated and replaced my Medical Template
 ##### 3. CPT database is now coming from Medicare and subsequently royalty-free.
-##### 4. ICD database update (Internal database is now depreciated).
-##### 5. Medication database update (Internal database is now depreciated with move to RXNorm API)
-##### 6. CVX database update (Internal database is now depreciated).
-##### 7. Patient education materials using VivaCare is now depreciated.
+##### 4. ICD database update (Internal database is now deprecated).
+##### 5. Medication database update (Internal database is now deprecated with move to RXNorm API)
+##### 6. CVX database update (Internal database is now deprecated).
+##### 7. Patient education materials using VivaCare is now deprecated.
 ##### 8. SMS sending using TextBelt
-##### 9. Supplements database update (Internal database is now depreciated).
-##### 10. Guardian roles database update (Internal database is now depreciated).
-##### 11. Sessions table depreciated (file based sessions currently in use with Laravel 5).
+##### 9. Supplements database update (Internal database is now deprecated).
+##### 10. Guardian roles database update (Internal database is now deprecated).
+##### 11. Sessions table deprecated (file based sessions currently in use with Laravel 5).
 
 # Notes
 ## Lab order templates:
@@ -89,7 +89,7 @@ Imported files are usually downloaded via script in the ../import directory.
 
 ## Database schema
 Below are the list of active database tables that are installed for NOSH.  Some table names are self explainatory, but those that are not
-will be explained here.  Some tables are depreciated if you happen to see the database schemas.
+will be explained here.  Some tables are deprecated if you happen to see the database schemas.
 	addressbook
 	alerts
 	allergies
diff --git a/resources/forms.yaml b/resources/forms.yaml
index 72f061e4..97d2e160 100644
--- a/resources/forms.yaml
+++ b/resources/forms.yaml
@@ -234,7 +234,7 @@ NICHQ Vanderbilt Assessment Scale for Parents, Part 2:
   scoring:
     0-11: Minimal symptoms
     12-27: ADHD, predominantly hyperactive type
-NICHQ Vanderbilt Assessment Scale for Parents, Part 2:
+NICHQ Vanderbilt Assessment Scale for Parents, Part 3:
   forms_title: NICHQ Vanderbilt Assessment Scale for Parents, Part 3
   forms_destination: HPI
   0:
@@ -274,7 +274,7 @@ NICHQ Vanderbilt Assessment Scale for Parents, Part 2:
     options: Never,Occasionally,Often,Very Often
   scoring:
     0-7: Minimal symptoms
-    8-24: Oppositional Definant Disorder Screen
+    8-24: Oppositional Defiant Disorder Screen
 HPQ-How is Your Health:
   forms_title: HPQ-How is Your Health
   forms_destination: HPI
@@ -284,9 +284,10 @@ HPQ-How is Your Health:
     text: Head-Headaches or Migraines
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect is not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   1:
     input: radio
@@ -294,9 +295,10 @@ HPQ-How is Your Health:
     text: Head-Faintness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect is not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   2:
     input: radio
@@ -304,9 +306,10 @@ HPQ-How is Your Health:
     text: Head-Dizziness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   3:
     input: radio
@@ -314,9 +317,10 @@ HPQ-How is Your Health:
     text: Head-Insomnia
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   4:
     input: radio
@@ -324,9 +328,10 @@ HPQ-How is Your Health:
     text: Eyes-Watery or itchy eyes
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   5:
     input: radio
@@ -334,9 +339,10 @@ HPQ-How is Your Health:
     text: Eyes-Swollen, red or sticky eyes
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   6:
     input: radio
@@ -344,9 +350,10 @@ HPQ-How is Your Health:
     text: Eyes-Bags or dark circles under eyes
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   7:
     input: radio
@@ -354,9 +361,10 @@ HPQ-How is Your Health:
     text: Eyes-Blurred or tunnel vision
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   8:
     input: radio
@@ -364,9 +372,10 @@ HPQ-How is Your Health:
     text: Ears-Itchy ears
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   9:
     input: radio
@@ -374,9 +383,10 @@ HPQ-How is Your Health:
     text: Ears-Earache, ear infection
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   10:
     input: radio
@@ -384,9 +394,10 @@ HPQ-How is Your Health:
     text: Ears-Ear drainage or excessive wax
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   11:
     input: radio
@@ -394,19 +405,21 @@ HPQ-How is Your Health:
     text: Ears-Ear ringing or hearing loss
     options: >
       Never or almost never,Occasionally have
-      it, effect is not severe,Occasionally
-      have it, effect is severe,Frequently
-      have it, effect not severe,Frequently
-      have it, effect is severe
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
+      effect is severe
   12:
     input: radio
     name: nose-stuffy_nose
     text: Nose-Stuffy nose
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   13:
     input: radio
@@ -414,9 +427,10 @@ HPQ-How is Your Health:
     text: Nose-Sinus problems
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   14:
     input: radio
@@ -424,9 +438,10 @@ HPQ-How is Your Health:
     text: Nose-Hay fever
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is sever,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   15:
     input: radio
@@ -434,9 +449,10 @@ HPQ-How is Your Health:
     text: Nose-Sneezing attacks
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   16:
     input: radio
@@ -444,9 +460,10 @@ HPQ-How is Your Health:
     text: Nose-Excessive nasal mucous
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   17:
     input: radio
@@ -454,9 +471,10 @@ HPQ-How is Your Health:
     text: Oral-Chronic cough
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   18:
     input: radio
@@ -464,9 +482,10 @@ HPQ-How is Your Health:
     text: Oral-Gagging, clearing throat
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   19:
     input: radio
@@ -474,9 +493,10 @@ HPQ-How is Your Health:
     text: Oral-Sore throat, hoarse
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   20:
     input: radio
@@ -484,9 +504,10 @@ HPQ-How is Your Health:
     text: Oral-Swollen tongue, lips, gums
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   21:
     input: radio
@@ -494,9 +515,10 @@ HPQ-How is Your Health:
     text: Oral-Canker sores
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   22:
     input: radio
@@ -504,9 +526,10 @@ HPQ-How is Your Health:
     text: Skin-Acne
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   23:
     input: radio
@@ -514,9 +537,10 @@ HPQ-How is Your Health:
     text: Skin-Hives, rashes, dryness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   24:
     input: radio
@@ -524,9 +548,10 @@ HPQ-How is Your Health:
     text: Skin-Hair loss
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   25:
     input: radio
@@ -534,9 +559,10 @@ HPQ-How is Your Health:
     text: Skin-Flushing, hot flashes
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   26:
     input: radio
@@ -544,9 +570,10 @@ HPQ-How is Your Health:
     text: Skin-Excessive sweating
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   27:
     input: radio
@@ -554,9 +581,10 @@ HPQ-How is Your Health:
     text: Heart-Irregular, skipped beats
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   28:
     input: radio
@@ -564,9 +592,10 @@ HPQ-How is Your Health:
     text: Heart-Rapid, pounding
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   29:
     input: radio
@@ -574,9 +603,10 @@ HPQ-How is Your Health:
     text: Heart-Chest pain
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   30:
     input: radio
@@ -584,9 +614,10 @@ HPQ-How is Your Health:
     text: Lungs-Chest congestion
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   31:
     input: radio
@@ -594,9 +625,10 @@ HPQ-How is Your Health:
     text: Lungs-Asthma, bronchitis
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   32:
     input: radio
@@ -604,9 +636,10 @@ HPQ-How is Your Health:
     text: Lungs-Shortness of breath
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   33:
     input: radio
@@ -614,9 +647,10 @@ HPQ-How is Your Health:
     text: Lungs-Difficulty breathing
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   34:
     input: radio
@@ -624,9 +658,10 @@ HPQ-How is Your Health:
     text: Other-Frequent illness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   35:
     input: radio
@@ -634,9 +669,10 @@ HPQ-How is Your Health:
     text: Other-Frequent/urgent urination
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   36:
     input: radio
@@ -644,9 +680,10 @@ HPQ-How is Your Health:
     text: Other-Genital itch
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   37:
     input: radio
@@ -654,9 +691,10 @@ HPQ-How is Your Health:
     text: Digestion-Nausea, Vomiting
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   38:
     input: radio
@@ -664,9 +702,10 @@ HPQ-How is Your Health:
     text: Digestion-Diarrhea or loose stools
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect is not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   39:
     input: radio
@@ -674,9 +713,10 @@ HPQ-How is Your Health:
     text: Digestion-Constipation
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   40:
     input: radio
@@ -684,9 +724,10 @@ HPQ-How is Your Health:
     text: Digestion-Bloated feeling
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   41:
     input: radio
@@ -694,9 +735,10 @@ HPQ-How is Your Health:
     text: Digestion-Belching, passing gas
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   42:
     input: radio
@@ -704,9 +746,10 @@ HPQ-How is Your Health:
     text: Digestion-Heartburn, acid reflux
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   43:
     input: radio
@@ -714,9 +757,10 @@ HPQ-How is Your Health:
     text: Digestion-Stomach or Intestinal pain
     options: >
       Never or almost never,Occasionally have
-      it, effect not sever,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   44:
     input: radio
@@ -724,9 +768,10 @@ HPQ-How is Your Health:
     text: Joints/Muscle-Pain or aches in joints
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   45:
     input: radio
@@ -734,9 +779,10 @@ HPQ-How is Your Health:
     text: Joints/Muscles-Arthritis
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   46:
     input: radio
@@ -747,9 +793,10 @@ HPQ-How is Your Health:
       movement
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   47:
     input: radio
@@ -757,9 +804,10 @@ HPQ-How is Your Health:
     text: Joints/Muscles-Pain or aches in muscles
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   48:
     input: radio
@@ -770,9 +818,10 @@ HPQ-How is Your Health:
       tiredness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   49:
     input: radio
@@ -780,9 +829,10 @@ HPQ-How is Your Health:
     text: Weight-Binge eating/drinking
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   50:
     input: radio
@@ -790,9 +840,10 @@ HPQ-How is Your Health:
     text: Weight-Craving certain foods
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   51:
     input: radio
@@ -800,9 +851,10 @@ HPQ-How is Your Health:
     text: Weight-Excess weight
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   52:
     input: radio
@@ -810,9 +862,10 @@ HPQ-How is Your Health:
     text: Weight-Compulsive eating
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   53:
     input: radio
@@ -820,9 +873,10 @@ HPQ-How is Your Health:
     text: Weight-Water retention
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   54:
     input: radio
@@ -830,9 +884,10 @@ HPQ-How is Your Health:
     text: Weight-Underweight
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   55:
     input: radio
@@ -840,9 +895,10 @@ HPQ-How is Your Health:
     text: Weight-Lack of appetite
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   56:
     input: radio
@@ -850,9 +906,10 @@ HPQ-How is Your Health:
     text: Energy/Activity-Fatigue, sluggishness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   57:
     input: radio
@@ -860,9 +917,10 @@ HPQ-How is Your Health:
     text: Energy/Activity-Apathy, lethargy
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   58:
     input: radio
@@ -870,9 +928,10 @@ HPQ-How is Your Health:
     text: Energy/Activity-Hyperactivity
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   59:
     input: radio
@@ -880,9 +939,10 @@ HPQ-How is Your Health:
     text: Energy/Activity-Restlessness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   60:
     input: radio
@@ -890,9 +950,10 @@ HPQ-How is Your Health:
     text: Mind-Poor memory
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   61:
     input: radio
@@ -900,9 +961,10 @@ HPQ-How is Your Health:
     text: Mind-Confusion, poor comprehension
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   62:
     input: radio
@@ -910,9 +972,10 @@ HPQ-How is Your Health:
     text: Mind-Poor concentration
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   63:
     input: radio
@@ -920,9 +983,10 @@ HPQ-How is Your Health:
     text: Mind-Poor physical coordination
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   64:
     input: radio
@@ -930,9 +994,10 @@ HPQ-How is Your Health:
     text: Mind-Difficulty making decisions
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   65:
     input: radio
@@ -940,9 +1005,10 @@ HPQ-How is Your Health:
     text: Mind-Stuttering or stammering
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   66:
     input: radio
@@ -950,9 +1016,10 @@ HPQ-How is Your Health:
     text: Mind-Slurred speach
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   67:
     input: radio
@@ -960,9 +1027,10 @@ HPQ-How is Your Health:
     text: Mind-Learning disabilities
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   68:
     input: radio
@@ -970,9 +1038,10 @@ HPQ-How is Your Health:
     text: Emotions-Mood swings
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   69:
     input: radio
@@ -980,9 +1049,10 @@ HPQ-How is Your Health:
     text: Emotions-Anxiety, fear, nervousness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   70:
     input: radio
@@ -993,9 +1063,10 @@ HPQ-How is Your Health:
       aggressiveness
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   71:
     input: radio
@@ -1006,9 +1077,10 @@ HPQ-How is Your Health:
       joy
     options: >
       Never or almost never,Occasionally have
-      it, effect not severe,Occasionally have
-      it, effect is severe,Frequently have it,
-      effect not severe,Frequently have it,
+      it - effect not severe,Occasionally have
+      it - effect is severe,Frequently have it -
+      effect is not severe,
+      Frequently have it -
       effect is severe
   scoring: >
     1-15 Low toxic load, 15-49 Moderate
diff --git a/resources/lang/en/nosh.php b/resources/lang/en/nosh.php
index fc28726f..9cd47809 100644
--- a/resources/lang/en/nosh.php
+++ b/resources/lang/en/nosh.php
@@ -354,7 +354,7 @@
     "text_instruct" => "After you're done with your text, click on the spot of the image to drop it in place.",
     "text_placeholder" => "Text to Place in Image",
 
-    // UMA
+    // UMA - User Managed Access
     "uma_url" => "Copy the link (URL) from your email or SMS that you received from your patient",
     "uma_error" => "Error",
     "uma_error_text1" => "You have tried to login to this patient's personal electronic health record but you do not have sufficient priviledges to access it.",
diff --git a/resources/lang/es/nosh.php b/resources/lang/es/nosh.php
index f8f29cc5..8c4c5e0e 100644
--- a/resources/lang/es/nosh.php
+++ b/resources/lang/es/nosh.php
@@ -353,7 +353,7 @@
     "text_instruct" => "Después de que haya terminado con su texto, haga clic en el lugar de la imagen para colocarlo en su lugar.",
     "text_placeholder" => "Texto para colocar en la imagen",
 
-    // UMA
+    // UMA - User Managed Access
     "uma_url" => "Copie el enlace (URL) de su correo electrónico o SMS que recibió de su paciente",
     "uma_error" => "Error",
     "uma_error_text1" => "Ha intentado iniciar sesión en el registro electrónico personal de salud de este paciente, pero no tiene los privilegios suficientes para acceder a él.",
diff --git a/resources/lang/phl/nosh.php b/resources/lang/phl/nosh.php
index c983268f..002480bc 100644
--- a/resources/lang/phl/nosh.php
+++ b/resources/lang/phl/nosh.php
@@ -354,7 +354,7 @@
     "text_instruct" => "After you're done with your text, click on the spot of the image to drop it in place.",
     "text_placeholder" => "Text to Place in Image",
 
-    // UMA
+    // UMA - User Managed Access
     "uma_url" => "Copy the link (URL) from your email or SMS that you received from your patient",
     "uma_error" => "Error",
     "uma_error_text1" => "You have tried to login to this patient's personal electronic health record but you do not have sufficient priviledges to access it.",
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 41054544..c8765202 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -13,7 +13,7 @@
             NOSH ChartingSystem
         @endif
     </title>
-    {!! $assets_css !!}
+    {!! $assets_css !!} {{-- renders html tags; {{ }} would not render html tags --}}
     @yield('view.stylesheet')
     <style>
 		@import url(https://fonts.googleapis.com/css?family=Nunito);
@@ -1074,11 +1074,13 @@ function loadimagepreview(){
         function progressbartrack() {
             $.ajax({
                 type: "POST",
-                url: noshdata.progress,
-                data: "id=" + noshdata.progress_id,
+                url: noshdata.progress, // http://localhost/progress
+                data: "id=" + noshdata.progress_id, // e.g. 1617232007_1_track
+                // the response will be the content of the tracking file
+                // a number >= 0 and <= 100
                 success: function(data) {
                     var w = data + "%";
-                    $('#progressdata').attr('area-valuenow', data).text(w).css('width', w);
+                    $('#progressdata').attr('aria-valuenow', data).text(w).css('width', w);
                     if (parseInt(data) < 100) {
                         setTimeout(progressbartrack, 5000);
                     }
@@ -1150,7 +1152,7 @@ function print_summary()
         });
 
         $(document).ready(function() {
-            var tz = jstz.determine();
+            var tz = jstz.determine(); // time zone detection
             $.cookie('nosh_tz', tz.name(), { path: '/' });
             $(".fancybox").fancybox({
                 openEffect: "none",
@@ -1214,7 +1216,7 @@ function print_summary()
                     $('#loadingModal').modal('hide');
                 });
             });
-            $('a').css('cursor', 'pointer').on('click', function(event) {
+            $('a').css('cursor', 'pointer').on('click', function(event) { // changes cursor from arrow to pointer
                 if ($(this).attr('href') !== undefined) {
                     if ($(this).attr('id') == 'nosh_messaging_add_photo' || $(this).hasClass('nosh-photo-delete') || $(this).hasClass('nosh-photo-delete-t-message') || $(this).attr('id') == 'nosh_t_message_add_action' || $(this).attr('id') == 'nosh_t_message_add_photo') {
                         event.preventDefault();
@@ -1452,7 +1454,7 @@ function print_summary()
                     },
                     successCallback: function (url) {
                         $('#progressModal').modal('hide');
-                        $('#progressdata').attr('area-valuenow', '0').text('0' + "%");
+                        $('#progressdata').attr('aria-valuenow', '0').text('0' + "%");
                     }
                 });
             }
diff --git a/routes/web.php b/routes/web.php
index da58a873..a174680b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -79,7 +79,7 @@
 Route::get('dashboard_tests', ['as' => 'dashboard_tests', 'uses' => 'CoreController@dashboard_tests']);
 Route::any('dashboard_tests_reconcile/{id}', ['as' => 'dashboard_tests_reconcile', 'uses' => 'CoreController@dashboard_tests_reconcile']);
 Route::get('dashboard_t_messages', ['as' => 'dashboard_t_messages', 'uses' => 'CoreController@dashboard_t_messages']);
-Route::get('database_export/{tracK_id?}', ['as' => 'database_export', 'uses' => 'CoreController@database_export']);
+Route::get('database_export/{track_id?}', ['as' => 'database_export', 'uses' => 'CoreController@database_export']);
 Route::any('database_import', ['as' => 'database_import', 'uses' => 'CoreController@database_import']);
 Route::any('database_import_cloud', ['as' => 'database_import_cloud', 'uses' => 'CoreController@database_import_cloud']);
 Route::any('database_import_file', ['as' => 'database_import_file', 'uses' => 'CoreController@database_import_file']);