diff --git a/index.html b/index.html
index f184873a..c4bf8171 100644
--- a/index.html
+++ b/index.html
@@ -135,12 +135,16 @@ <h5>Saved Records</h5>
                                 <li><a id="open" class="dropdown-item" href="#">
                                         <span class="material-symbols-outlined">file_open</span> Open Audio
                                         File(s) <span class="shortcut float-end">Ctrl+O</span></a></li>
-                                <li><a class="dropdown-item disabled" id="saveLabels" href="#">
-                                        <span class="material-symbols-outlined">label</span> Save Audacity
-                                        Labels</a></li>
+                                        <hr class="dropdown-divider">
+                                <li><a class="dropdown-item disabled" id="saveCSV" href="#">
+                                        <span class="material-symbols-outlined">ios_share</span> Export Results
+                                        to CSV</a></li>                                        
                                 <li><a class="dropdown-item disabled" id="export-audio" href="#">
                                         <span class="material-symbols-outlined">music_note</span> Export Selected
                                         Audio <span class="shortcut float-end">Ctrl+E</span></a></li>
+                                <li><a class="dropdown-item disabled" id="saveLabels" href="#">
+                                        <span class="material-symbols-outlined">label</span> Save Audacity
+                                        Labels</a></li>
                                 <li>
                                     <hr class="dropdown-divider">
                                 <li><a class="dropdown-item" href="#" id="exit">
@@ -577,11 +581,11 @@ <h5>Saved Records</h5>
                                                     <div class="col pe-0">
                                                         <div class="form-group rounded p-2 mb-2 text-bg-danger">
                                                             <span class="circle me-2"
-                                                                title="Enter debug mode (requires Chirpity relaunch)">?</span>
+                                                                title="Enter debug mode (requires Chirpity relaunch to take effect)">?</span>
                                                             <div class="form-check form-switch">
                                                                 <input class="form-check-input" type="checkbox"
                                                                     role="switch" id="debug-mode">
-                                                                <label class="form-check-label" for="debug-mode">Debug mode (requires application relaunch)</label>
+                                                                <label class="form-check-label" for="debug-mode">Debug mode</label>
                                                             </div>
 
                                                         </div>
@@ -656,7 +660,40 @@ <h5 class="modal-title" id="record-entry-modal-label">Archive Record</h5>
                         </button>
                     </div>
                     <form id="record-entry-form">
-                        <div id="record-entry-modal-body" class="modal-body"></div>
+                        <div id="record-entry-modal-body" class="modal-body">
+                            <div class="row">
+                                <div class="col-8" id="record-entry-birdlist"></div>
+                                <div class="col hide-in-batch">
+                                    <div class="form-floating mb-3">
+                                        <input type="number" id="call-count" class="form-control" min="1">
+                                        <label for="call-count">Call Count</label>
+                                    </div>
+                                </div>
+                            </div>
+                            <fieldset class="border  ps-3 pt-1">
+                                <label for="record-label" class="text-muted" style="font-size: .75em">Call Type</label><br>
+                                <div class="form-check form-check-inline">
+                                    <input class="form-check-input" type="radio" name="record-label" id="label-local" value="Local">
+                                    <label class="form-check-label" for="label-local">Local</label>
+                                </div>
+                                <div class="form-check form-check-inline">
+                                        <input class="form-check-input" type="radio" name="record-label" id="label-nocmig" value="Nocmig">
+                                        <label class="form-check-label" for="label-nocmig">Nocmig</label>
+                                </div>
+                                <div class="form-check form-check-inline">
+                                    <input class="form-check-input" type="radio" name="record-label" id="label-unknown" value="">
+                                    <label class="form-check-label" for="label-unknown">Not specified</label>
+                                </div>
+                            </fieldset>
+                            <div class="form-floating mt-3 hide-in-batch">
+                                <textarea class="form-control" id="record-comment" style="height: 200px"></textarea>
+                                <label for="record-comment">Comments</label>
+                                <input type='hidden' id='DBmode'>
+                                <input type='hidden' id='batch-mode'>
+                                <input type='hidden' id='original-id'>
+                            </div>
+
+                        </div>
                         <div class="modal-footer justify-content-center">
                             <button id="record-add" type="submit" class="btn btn-success">Add</button>
                             <button id="record-dismiss" type="button" class="btn btn-danger"
diff --git a/js/ui.js b/js/ui.js
index a42df479..7e374a75 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -482,13 +482,11 @@ function showDatePicker() {
         postBufferUpdate({ file: currentFile, begin: bufferBegin })
         // Remove the form from the DOM
         form.remove();
-        document.addEventListener('keydown', handleKeyDownDeBounce, true);
     });
     // Add click event listener to the cancel button
     cancelButton.addEventListener("click", function () {
         // Remove the form from the DOM
         form.remove();
-        document.addEventListener('keydown', handleKeyDownDeBounce, true);
     });
 }
 
@@ -614,7 +612,7 @@ async function setLocation() {
     const locationModalDiv = document.getElementById('locationModal');
     const locationModal = new bootstrap.Modal(locationModalDiv);
     locationModal.show();
-    document.removeEventListener('keydown', handleKeyDownDeBounce, true);
+    //document.removeEventListener('keydown', handleKeyDownDeBounce, true);
 
     // Submit action
     const locationForm = document.getElementById('locationForm');
@@ -644,7 +642,6 @@ async function setLocation() {
     }
     locationAdd.addEventListener('click', addLocation)
     const onModalDismiss = () => {
-        enableKeyDownEvent();
         locationForm.reset();
         locationAdd.removeEventListener('click', addLocation);
         locationModalDiv.removeEventListener('hide.bs.modal', onModalDismiss);
@@ -826,10 +823,10 @@ function postAnalyseMessage(args) {
 
 
 /// Lat / lon
-const place = document.getElementById('place')
-$('#latitude, #longitude').on('focus', function () {
-    document.removeEventListener('keydown', handleKeyDownDeBounce, true);
-})
+// const place = document.getElementById('place')
+// $('#latitude, #longitude').on('focus', function () {
+//     document.removeEventListener('keydown', handleKeyDownDeBounce, true);
+// })
 
 function getLocation(lat, lon, isDefault) {
     return new Promise(async (resolve, reject) => {
@@ -859,7 +856,6 @@ function getLocation(lat, lon, isDefault) {
     })
 }
 $('#latitude, #longitude').on('blur', async function () {
-    enableKeyDownEvent();
     const lat = document.getElementById('latitude').value;
     const lon = document.getElementById('longitude').value;
     const address = await getLocation(lat, lon, true);
@@ -947,10 +943,12 @@ export2audio.addEventListener('click', batchExportAudio);
 
 async function batchExportAudio(e) {
     const species = isSpeciesViewFiltered(true); // || getSpecies(e.target);
-    if (!species) {
-        alert("Filter results by species to export audio files");
-        return
-    }
+    species ? exportData(limit, species) : alert("Filter results by species to export audio files");
+}
+
+const export2CSV = ()  => exportData(isSpeciesViewFiltered(true), Infinity);
+
+async function exportData(species, limit){
     const response = await window.electron.selectDirectory('selectDirectory');
     if (!response.canceled) {
         const directory = response.filePaths[0];
@@ -960,7 +958,7 @@ async function batchExportAudio(e) {
             species: species,
             files: isExplore() ? [] : fileList,
             explore: isExplore(),
-            limit: 100,
+            limit: limit,
             range: isExplore() ? STATE.explore.range : undefined
         })
     }
@@ -997,6 +995,7 @@ exploreLink.addEventListener('click', async () => {
     locationFilter.addEventListener('change', handleLocationFilterChange);
     hideAll();
     showElement(['exploreWrapper', 'spectrogramWrapper'], false);
+    enableMenuItem(['saveCSV']);
     adjustSpecDims(true)
     worker.postMessage({ action: 'filter', species: undefined, range: STATE.explore.range, explore: true }); // re-prepare
 });
@@ -1006,13 +1005,6 @@ datasetLink.addEventListener('click', async () => {
     worker.postMessage({ action: 'create-dataset' });
 });
 
-// $('.spec-labels').on('mousedown', (e) => {
-//     e.stopImmediatePropagation();
-//     console.log('label draggggggggggggg')
-// })
-
-// thresholdLink.addEventListener('keypress', handleThresholdChange );
-
 const checkWidth = (text) => {
     // Create a temporary element to measure the width of the text
     const tempElement = document.createElement('span');
@@ -1332,7 +1324,7 @@ window.onload = async () => {
         longitude: 0.89, // Great Snoring :)
         location: 'Great Snoring, North Norfolk, Norfolk, England, United Kingdom',
         detect: { nocmig: false, contextAware: false, confidence: 45 },
-        filters: { active: false, highPassFrequency: 0, lowShelfFrequency: 0, lowShelfAttenuation: 18, SNR: 0 },
+        filters: { active: true, highPassFrequency: 250, lowShelfFrequency: 0, lowShelfAttenuation: 0, SNR: 0 },
         warmup: true,
         backend: 'tensorflow',
         tensorflow: { threads: diagnostics['Cores'], batchSize: 32 },
@@ -1489,8 +1481,9 @@ const setUpWorkerMessaging = () => {
                             species: isSpeciesViewFiltered(true),
                             active: getActiveRowID(),
                         }); // no re-prepare
+                        } else {
+                            alert(args.message) 
                         }
-                        alert(args.message) 
                     }
                     break;
                 case 'location-list':
@@ -1887,6 +1880,7 @@ $(document).on('click', '.play', function () {
 
 
 function handleKeyDownDeBounce(e) {
+    console.log('keydown handler called')
     e.preventDefault();
     waitForFinalEvent(function () {
         handleKeyDown(e);
@@ -1913,9 +1907,6 @@ function handleKeyDown(e) {
     });
 }
 
-function enableKeyDownEvent() {
-    document.addEventListener('keydown', handleKeyDownDeBounce, true);
-}
 
 
 ///////////// Nav bar Option handlers //////////////
@@ -2353,14 +2344,14 @@ const postBufferUpdate = ({
 const goto = new bootstrap.Modal(document.getElementById('gotoModal'));
 const showGoToPosition = () => {
     if (currentFile) {
-        document.removeEventListener('keydown', handleKeyDownDeBounce, true);
+        //document.removeEventListener('keydown', handleKeyDownDeBounce, true);
         goto.show();
 
     }
 }
 
 const gotoModal = document.getElementById('gotoModal')
-gotoModal.addEventListener('hidden.bs.modal', enableKeyDownEvent)
+//gotoModal.addEventListener('hidden.bs.modal', enableKeyDownEvent)
 
 gotoModal.addEventListener('shown.bs.modal', () => {
     document.getElementById('timeInput').focus()
@@ -2616,10 +2607,10 @@ async function onPredictionDone({
     total > config.limit ? addPagination(total, offset) : pagination.forEach(item => item.classList.add('d-none'));
     if (action !== 'filter') {
         if (! isEmptyObject(AUDACITY_LABELS)) {
-            enableMenuItem(['saveLabels']);
+            enableMenuItem(['saveLabels', 'saveCSV']);
             $('.download').removeClass('disabled');
         } else {
-            disableMenuItem(['saveLabels']);
+            disableMenuItem(['saveLabels', 'saveCSV']);
         }
         if (currentFile) enableMenuItem(['analyse'])
 
@@ -2803,7 +2794,7 @@ async function renderResult({
             shownDaylightBanner = true;
         }
         const commentHTML = comment ?
-            `<span title="${comment}" class='material-symbols-outlined pointer'>comment</span>` : '';
+            `<span title="${comment.replaceAll('\"', '&quot;')}" class='material-symbols-outlined pointer'>comment</span>` : '';
         const isUncertain = score < 65 ? '&#63;' : '';
         // result.filename  and result.date used for feedback
         result.date = timestamp;
@@ -3034,6 +3025,7 @@ const exportAudio = () => {
 
 document.getElementById('open').addEventListener('click', showOpenDialog);
 document.getElementById('saveLabels').addEventListener('click', showSaveDialog);
+document.getElementById('saveCSV').addEventListener('click', export2CSV);
 document.getElementById('export-audio').addEventListener('click', exportAudio);
 
 
@@ -3389,7 +3381,20 @@ $(function () {
 
 
 document.addEventListener("DOMContentLoaded", function () {
-    enableKeyDownEvent();
+    document.addEventListener("keydown", handleKeyDownDeBounce, true);
+    const formFields = document.querySelectorAll("input, textarea, select");
+    // Disable keyboard shortcuts when any form field gets focus
+    formFields.forEach((formField) => {
+        formField.addEventListener("focus", () => {
+            console.log("focus")
+            document.removeEventListener("keydown", handleKeyDownDeBounce, true);
+        });
+    
+        formField.addEventListener("blur", () => {
+            console.log('blur')
+            document.addEventListener("keydown", handleKeyDownDeBounce, true);
+        });
+    });
     // make menu an accordion for smaller screens
     if (window.innerWidth < 768) {
 
@@ -3769,7 +3774,6 @@ function positionMenu(menu, event) {
         top: top,
         left: left
     }).addClass("show");
-    //return false; //blocks default Webbrowser right click menu
 }
 
 $('#spectrogramWrapper, #resultTableContainer, #selectionResultTableBody').on('contextmenu', createContextMenu)
@@ -3784,62 +3788,53 @@ const recordEntryHandler = () => {
     }); // no re-prepare
 }
 
+const recordEntryForm = document.getElementById('record-entry-form');
+
 async function showRecordEntryForm(mode, batch) {
     const cname = batch ? document.querySelector('#speciesFilter .text-warning .cname .cname').innerText : region.attributes.label.replace('?', '');
     let callCount = '', typeIndex = '', commentText = '';
     if (cname && activeRow) {
         // Populate the form with existing values
         commentText = activeRow.querySelector('.comment > span')?.title || '';
-
-        callCount = activeRow.querySelector('.call-count').innerText;
-        callCount = callCount.replace('Present', '');
+        callCount = activeRow.querySelector('.call-count').innerText.replace('Present', '');
         typeIndex = ['Local', 'Nocmig', ''].indexOf(activeRow.querySelector('.label').innerText);
     }
-    let speciesList = `
-    <div class="row">
-        <div class="col-8">
-            ${generateBirdOptionList({ store: 'allSpecies', rows: undefined, selected: cname })}
-        </div>`;
-    if (!batch) {
-        speciesList += `<div class="col"><div class="form-floating mb-3">
-            <input type="number" id="call-count" value="${callCount}" class="form-control" min="1">
-            <label for="call-count">Call Count</label>
-        </div></div>`;
-    }
-    speciesList += '</div>';
-    const label = `
-    <fieldset class="border  ps-3 pt-1">
-        <label for="record-label" class="text-muted" style="font-size: .75em">Call Type</label><br>
-        <div class="form-check form-check-inline">
-            <input class="form-check-input" type="radio" name="record-label" id="label-local" value="Local">
-            <label class="form-check-label" for="label-local">Local</label>
-        </div>
-        <div class="form-check form-check-inline">
-                <input class="form-check-input" type="radio" name="record-label" id="label-nocmig" value="Nocmig">
-                <label class="form-check-label" for="label-nocmig">Nocmig</label>
-        </div>
-        <div class="form-check form-check-inline">
-            <input class="form-check-input" type="radio" name="record-label" id="label-unknown" value="">
-            <label class="form-check-label" for="label-unknown">Not specified</label>
-        </div>
-    </fieldset>`;
-    let comment = '<div class="form-floating mt-3">';
-    if (!batch) comment += `<textarea class="form-control" id="record-comment" style="height: 200px">${commentText}</textarea><label for="record-comment">Comments</label>`;
-    comment += `<input type='hidden' id='DBmode' value='${mode}'>
-            <input type='hidden' id='batch-mode' value='${batch}'>
-            <input type='hidden' id='original-id' value='${cname}'>
-        </div>`;
-    $('#record-entry-modal-body').html(speciesList + label + comment);
-    const action = document.getElementById('record-add')
-    action.innerText = mode;
-
-    //action.addEventListener('click', recordEntryHandler)
-    if (typeIndex) document.querySelectorAll('input[name="record-label"]')[typeIndex].checked = true;
-    // Clear entry on input focus, so list appears
-    document.removeEventListener('keydown', handleKeyDownDeBounce, true);
+    const recordEntryBirdList = recordEntryForm.querySelector('#record-entry-birdlist');
+    recordEntryBirdList.innerHTML = generateBirdOptionList({ store: 'allSpecies', rows: undefined, selected: cname });
+    const batchHide = recordEntryForm.querySelectorAll('.hide-in-batch');
+    batchHide.forEach(el => batch ? el.classList.add('d-none') : el.classList.remove('d-none'));
+    recordEntryForm.querySelector('#call-count').value = callCount;
+    recordEntryForm.querySelector('#record-comment').value = commentText;
+    recordEntryForm.querySelector('#DBmode').value = mode;
+    recordEntryForm.querySelector('#batch-mode').value = batch;
+    recordEntryForm.querySelector('#original-id').value = cname;
+    recordEntryForm.querySelector('#record-add').innerText = mode;
+    if (typeIndex) recordEntryForm.querySelectorAll('input[name="record-label"]')[typeIndex].checked = true;
     recordEntryModal.show();
 }
 
+recordEntryForm.addEventListener('submit', function (e) {
+    e.preventDefault();
+    const action = document.getElementById('DBmode').value;
+    // cast boolstring to boolean
+    const batch = document.getElementById('batch-mode').value === 'true';
+    const cname = document.getElementById('bird-list-all').value;
+    let start, end;
+    if (region) {
+        start = bufferBegin + region.start;
+        end = bufferBegin + region.end;
+        region.attributes.label = cname;
+    }
+    const originalCname = document.getElementById('original-id').value;
+    // Update the region label
+    const count = document.getElementById('call-count')?.value;
+    const comment = document.getElementById('record-comment')?.value;
+    const label = document.querySelector('input[name="record-label"]:checked')?.value || '';
+    recordEntryModal.hide();
+    insertManualRecord(cname, start, end, comment, count, label, action, batch, originalCname)
+})
+
+
 const insertManualRecord = (cname, start, end, comment, count, label, action, batch, originalCname) => {
     const files = batch ? fileList : currentFile;
     const insert = (toDisk) => {
@@ -3857,6 +3852,7 @@ const insertManualRecord = (cname, start, end, comment, count, label, action, ba
             batch: batch,
             toDisk: toDisk
         })
+
     }
     if (STATE.mode === 'analyse') {
         //Update the record in the memory db 
@@ -3868,30 +3864,6 @@ const insertManualRecord = (cname, start, end, comment, count, label, action, ba
 
 }
 
-const recordEntryForm = document.getElementById('record-entry-form');
-recordEntryForm.addEventListener('submit', function (e) {
-    e.preventDefault();
-    const action = document.getElementById('DBmode').value;
-    // cast boolstring to boolean
-    const batch = document.getElementById('batch-mode').value === 'true';
-    const cname = document.getElementById('bird-list-all').value;
-    let start, end;
-    if (region) {
-        start = bufferBegin + region.start;
-        end = bufferBegin + region.end;
-        region.attributes.label = cname;
-    }
-    const originalCname = document.getElementById('original-id').value;
-    // Update the region label
-    const count = document.getElementById('call-count')?.value;
-    const comment = document.getElementById('record-comment')?.value;
-    const label = document.querySelector('input[name="record-label"]:checked')?.value || '';
-    recordEntryModal.hide();
-    insertManualRecord(cname, start, end, comment, count, label, action, batch, originalCname)
-})
-
-const recordEntryModalDiv = document.getElementById('record-entry-modal')
-recordEntryModalDiv.addEventListener('hidden.bs.modal', enableKeyDownEvent);
 
 const purgeFile = document.getElementById('purge-file');
 purgeFile.addEventListener('click', deleteFile)
diff --git a/js/worker.js b/js/worker.js
index 31bfd9ed..47c66299 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -10,6 +10,7 @@ const { utimesSync } = require('utimes');
 const stream = require("stream");
 const staticFfmpeg = require('ffmpeg-static-electron');
 const { stat } = require("fs/promises");
+const {writeToPath} = require('@fast-csv/format');
 import { State } from './state.js';
 import { sqlite3 } from './database.js';
 
@@ -419,7 +420,7 @@ const getResultsParams = (species, confidence, offset, limit, topRankin) => {
     if (STATE.locationID) {
         params.push(STATE.locationID);
     }
-    params.push(limit, offset);
+    if (limit !== Infinity) params.push(limit, offset);
     return params
 }
 
@@ -491,7 +492,7 @@ const prepSummaryStatement = () => {
     //console.log('Summary SQL statement:\n' + summaryStatement)
 }
 
-const prepResultsStatement = () => {
+const prepResultsStatement = (noLimit) => {
     let resultStatement = `
     WITH ranked_records AS (
         SELECT 
@@ -554,8 +555,8 @@ const prepResultsStatement = () => {
     if (STATE.locationID) {
         resultStatement += ' AND locationID = ? ';
     }
-
-    resultStatement += `ORDER BY ${STATE.sortOrder}, confidence DESC, callCount DESC LIMIT ? OFFSET ?`;
+    const useLimit = noLimit ? '' : 'LIMIT ?  OFFSET ?';
+    resultStatement += `ORDER BY ${STATE.sortOrder}, confidence DESC, callCount DESC ${useLimit}`;
     STATE.GET_RESULT_SQL = STATE.db.prepare(resultStatement);
     //console.log('Results SQL statement:\n' + resultStatement)
 }
@@ -2062,7 +2063,7 @@ const getResults = async ({
     topRankin = STATE.topRankin,
     exportTo = undefined
 } = {}) => {
-    prepResultsStatement();
+    prepResultsStatement(limit === Infinity);
     let confidence = STATE.detect.confidence;
     if (offset === undefined) { // Get offset state
         if (species) {
@@ -2082,39 +2083,124 @@ const getResults = async ({
     const speciesForSTMT = species || '%';
     const params = getResultsParams(speciesForSTMT, confidence, offset, limit, topRankin);
     const result = await STATE.GET_RESULT_SQL.allAsync(...params);
+    if (exportTo && limit === Infinity){
+        // Format the values
+        const formattedValues = result.map(formatCSVValues);
+        // Create a write stream for the CSV file
+        let filename = species ? species : 'All';
+        filename += '_detections.csv';
+        const filePath = p.join(exportTo, filename);
+        writeToPath(filePath, formattedValues, {headers: true})
+            .on('error', err => UI.postMessage({event: 'generate-alert', message: `Cannot save file ${filePath}\nbecause it is open in another application`}))
+            .on('finish', () => {
+                UI.postMessage({event: 'generate-alert', message: filePath + ' has been written successfully.'});
+            });
+    }
+    else {
 
-    for (let i = 0; i < result.length; i++) {
-        const r = result[i];
-        if (exportTo) {
-            // Format date to YYYY-MM-DD-HH-MM-ss
-            const dateString = new Date(r.timestamp).toISOString().replace(/[TZ]/g, ' ').replace(/\.\d{3}/, '').replace(/[-:]/g, '-').trim();
-            const filename = `${r.cname}-${dateString}.${STATE.audio.format}`
-            console.log(`Exporting from ${r.file}, position ${r.position}, into folder ${exportTo}`)
-            saveAudio(r.file, r.position, r.position + 3, filename, metadata, exportTo)
-            if (i === result.length - 1) UI.postMessage({ event: 'generate-alert', message: `${result.length} files saved` })
-        }
-        else if (species && context !== 'explore') {
-            // get a number for the circle
-            const { count } = await STATE.db.getAsync(`SELECT COUNT(*) as count FROM records WHERE dateTime = ?
-                                                 AND confidence >= ?`, r.timestamp, confidence);
-            r.count = count;
-            sendResult(++index, r, true);
-        } else {
-            sendResult(++index, r, true)
+        for (let i = 0; i < result.length; i++) {
+            const r = result[i];
+            if (exportTo) {
+                if (limit){
+                    // Format date to YYYY-MM-DD-HH-MM-ss
+                    const dateString = new Date(r.timestamp).toISOString().replace(/[TZ]/g, ' ').replace(/\.\d{3}/, '').replace(/[-:]/g, '-').trim();
+                    const filename = `${r.cname}-${dateString}.${STATE.audio.format}`
+                    console.log(`Exporting from ${r.file}, position ${r.position}, into folder ${exportTo}`)
+                    saveAudio(r.file, r.position, r.position + 3, filename, metadata, exportTo)
+                    if (i === result.length - 1) UI.postMessage({ event: 'generate-alert', message: `${result.length} files saved` })
+                } 
+            }
+            else if (species && context !== 'explore') {
+                // get a number for the circle
+                const { count } = await STATE.db.getAsync(`SELECT COUNT(*) as count FROM records WHERE dateTime = ?
+                                                    AND confidence >= ?`, r.timestamp, confidence);
+                r.count = count;
+                sendResult(++index, r, true);
+            } else {
+                sendResult(++index, r, true)
+            }
         }
-    }
-    console.log("Get Results took", (Date.now() - t0) / 1000, " seconds");
-    if (!result.length) {
-        if (STATE.selection) {
-            // No more detections in the selection
-            sendResult(++index, 'No detections found in the selection', true)
-        } else {
-            species = species || '';
-            sendResult(++index, `No ${species} detections found.`, true)
+        console.log("Get Results took", (Date.now() - t0) / 1000, " seconds");
+        if (!result.length) {
+            if (STATE.selection) {
+                // No more detections in the selection
+                sendResult(++index, 'No detections found in the selection', true)
+            } else {
+                species = species || '';
+                sendResult(++index, `No ${species} detections found.`, true)
+            }
         }
     }
+
 };
 
+// Function to format the CSV export
+function formatCSVValues(obj) {
+    // Create a copy of the original object to avoid modifying it directly
+    const modifiedObj = { ...obj };
+
+    // Step 1: Remove specified keys
+    delete modifiedObj.confidence_rank;
+    delete modifiedObj.filestart;
+    delete modifiedObj.speciesID;
+    delete modifiedObj.duration;
+    modifiedObj.score /= 1000;
+    modifiedObj.score = modifiedObj.score.toString().replace(/^2$/, 'confirmed');
+    // Step 2: Multiply 'end' by 1000 and add 'timestamp'
+    modifiedObj.end = (modifiedObj.end - modifiedObj.position) * 1000  + modifiedObj.timestamp;
+
+    // Step 3: Convert 'timestamp' and 'end' to a formatted string
+    //const date = new Date(modifiedObj.timestamp);
+    modifiedObj.timestamp = formatDate(modifiedObj.timestamp)
+    const end = new Date(modifiedObj.end);
+    modifiedObj.end = end.toISOString().slice(0, 19).replace('T', ' ');
+    // Rename the headers
+    modifiedObj['File'] = modifiedObj.file
+    delete modifiedObj.file;
+    modifiedObj['Detection start'] = modifiedObj.timestamp
+    delete modifiedObj.timestamp;
+    modifiedObj['Detection end'] = modifiedObj.end
+    delete modifiedObj.end;
+    modifiedObj['Common name'] = modifiedObj.cname
+    delete modifiedObj.cname;
+    modifiedObj['Latin name'] = modifiedObj.sname
+    delete modifiedObj.sname;
+    modifiedObj['Confidence'] = modifiedObj.score
+    delete modifiedObj.score;
+    modifiedObj['Label'] = modifiedObj.label
+    delete modifiedObj.label;
+    modifiedObj['Comment'] = modifiedObj.comment
+    delete modifiedObj.comment;
+    modifiedObj['Call count'] = modifiedObj.callCount
+    delete modifiedObj.callCount;
+    modifiedObj['File offset'] = secondsToHHMMSS(modifiedObj.position)
+    delete modifiedObj.position;
+    return modifiedObj;
+}
+
+function secondsToHHMMSS(seconds) {
+    const hours = Math.floor(seconds / 3600);
+    const minutes = Math.floor((seconds % 3600) / 60);
+    const remainingSeconds = seconds % 60;
+  
+    const HH = String(hours).padStart(2, '0');
+    const MM = String(minutes).padStart(2, '0');
+    const SS = String(remainingSeconds).padStart(2, '0');
+  
+    return `${HH}:${MM}:${SS}`;
+  }
+
+const formatDate = (timestamp) =>{
+    const date = new Date(timestamp);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
 const sendResult = (index, result, fromDBQuery) => {
     const file = result.file;
     if (typeof result === 'object') {
@@ -2617,40 +2703,23 @@ async function getLocations({ db = STATE.db, file }) {
     UI.postMessage({ event: 'location-list', locations: locations, currentLocation: metadata[file]?.locationID })
 }
 
-
-
-
-
 /*
 todo: bugs
-    ***when analysing second batch of results, the first results linger.
-    ***manual records entry doesn't preserve species in explore mode
-    ***save records to db doesn't work with updaterecord!
-    ***AUDACITY results for multiple files doesn't work well, as it puts labels in by position only. Need to make audacity an object,
-        and return the result for the current file only #######
-    ***In explore, editID doesn't change the label of the region to the new species
-    ***Analyse selection returns just the file in which the selection is requested
     Reported region duration tooltip incorrect 
 
 Todo: Database
-     ***Database delete: records, files (and all associated records). Use when reanalysing
      Database file path update, batch update - so we can move files around after analysis
      ***Compatibility with updates, esp. when num classes change
         -Create a new database for each model with appropriate num classes?
 
 Todo: Location.
-     ***Associate lat lon with files, expose lat lon settings in UI. Allow for editing once saved. 
-     ***Filter Explore, Chart by location
 
 Todo cache:
     Set cache location
     Control cache size in settings
 
 Todo: manual entry
-    ***check creation of manual entries
-    ***indicate manual entry/confirmed entry
-    save entire selected range as one entry. By default or as an option?
-    ***get entry to appear in position among existing detections and centre on it
+
 
 Todo: UI
     ***Better tooltips, for all options
diff --git a/package.json b/package.json
index b566bae0..4c753ed8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chirpity",
-  "version": "0.9.12",
+  "version": "0.10.0",
   "description": "Chirpity Nocmig",
   "main": "main.js",
   "scripts": {
@@ -25,7 +25,7 @@
       "**/*",
       "!test*${/*}",
       "!custom*{/*}",
-      "!.vscode${*/}",
+      "!.vscode${/*}",
       "!.idea{*/}",
       "!kernels.txt",
       "!minify.js",
@@ -179,11 +179,12 @@
     "electron": "^25.3.0",
     "electron-builder": "24.6.4",
     "electron-playwright-helpers": "^1.6.0",
-    "playwright": "^1.39.0",
     "jimp": "0.22.10",
+    "playwright": "^1.39.0",
     "terser": "5.22.0"
   },
   "dependencies": {
+    "@fast-csv/format": "^4.3.5",
     "@popperjs/core": "^2.9.2",
     "@tensorflow/tfjs-node": "4.10.0",
     "axios": "1.5.1",