diff --git a/index.html b/index.html
index 8b1641ea..05590a52 100644
--- a/index.html
+++ b/index.html
@@ -189,7 +189,7 @@ <h5>Saved Records</h5>
                                 <span class="material-symbols-outlined">unarchive</span> Remove Current File From
                                 Archive
                             </li>
-                            <li class="dropdown-item d-none" href="#" id="dataset">
+                            <li class="dropdown-item" href="#" id="dataset">
                                 <span class="material-symbols-outlined">dataset</span> Create Dataset
                             </li>
                         </ul>
@@ -912,8 +912,8 @@ <h5 class="modal-title" id="gotoModalLabel">Set Location</h5>
                     </span> Analyse</a>
                     <div class="dropdown-divider"></div>
                     <a class="dropdown-item" id="create-manual-record" href="#"><span class="material-symbols-outlined">
-                        post_add
-                    </span> Create Archive Record</a>
+                        edit_document
+                    </span> Edit Record</a>
                     <a class="dropdown-item" id="context-create-clip" href="#"><span class="material-symbols-outlined">
                         music_note
                     </span> Export Audio Clip</a>
@@ -940,7 +940,7 @@ <h5 class="modal-title" id="gotoModalLabel">Set Location</h5>
                             <!-- Controls view -->
                             <div class="container-fluid p-1 text-bg-dark d-inline-flex" id="controlsWrapper" style="max-height: 50px">
                                 <div id="filename" class="col-auto ps-1 overflow-visible flex-nowrap"></div>
-                                <div id="unsaved-icon" class="material-symbols-outlined ms-2 me-2 text-warning d-none" title="There are unsaved records">warning</div>
+                                <div id="unsaved-icon" class="material-symbols-outlined ms-2 me-2 text-warning d-none" title="There are unsaved edits">warning</div>
                                 <div class="col-auto btn-group bg-dark ms-2 me-2 text-nowrap" role="group">
                                     <button id="playToggle" class="p-1 pe-2 btn btn-outline-secondary">
                                         <span class="material-symbols-outlined ">play_circle</span><span
@@ -1130,7 +1130,7 @@ <h5 class="modal-title" id="gotoModalLabel">Set Location</h5>
                     lonTxt = 'customLon';
                 }
                 const showMap = (where) => {
-                    if (where === 'customLocationMap'){
+                    if (where === 'customLocationMap' && LOCATIONS.length){
                         const markerGroup = L.featureGroup(); // Create a feature group to hold the markers
 
                         const bounds = L.latLngBounds(); // Create bounds to include all markers
diff --git a/js/model.js b/js/model.js
index 0163b619..4f16bec2 100644
--- a/js/model.js
+++ b/js/model.js
@@ -366,6 +366,17 @@ class Model {
         })
     }
 
+    //Used by get-spectrogram
+    normalise_audio = (signal) => {
+        return tf.tidy(() => {
+            //signal = tf.tensor1d(signal, 'float32');
+            const sigMax = tf.max(signal);
+            const sigMin = tf.min(signal);
+            const range = sigMax.sub(sigMin);
+            //return signal.sub(sigMin).div(range).mul(tf.scalar(8192.0, 'float32')).sub(tf.scalar(4095, 'float32'))
+            return signal.sub(sigMin).div(range).mul(tf.scalar(2)).sub(tf.scalar(1))
+        })
+    };
     async predictChunk(audioBuffer, start, fileStart, file, threshold, confidence) {
         if (DEBUG) console.log('predictCunk begin', tf.memory().numTensors);
         audioBuffer = tf.tensor1d(audioBuffer);
diff --git a/js/ui.js b/js/ui.js
index bb57fa04..656c5c52 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -1,5 +1,5 @@
 let seenTheDarkness = false, shownDaylightBanner = false, LOCATIONS, locationID = undefined;
-let labels = [];
+let labels = [], DELETE_HISTORY = [];
 
 const STATE = {
     mode: 'analyse',
@@ -1027,7 +1027,7 @@ exploreLink.addEventListener('click', async () => {
 
 const datasetLink = document.getElementById('dataset');
 datasetLink.addEventListener('click', async () => {
-    worker.postMessage({ action: 'create-dataset' });
+    worker.postMessage({ action: 'create-dataset', species: isSpeciesViewFiltered(true) });
 });
 
 const checkWidth = (text) => {
@@ -1500,7 +1500,7 @@ const setUpWorkerMessaging = () => {
                         message += '\nWould you like to remove the file from the Archive?';
                         if (confirm(message)) deleteFile(args.file)
                     } else { 
-                        if (args.savedToDB){
+                        if (args.filter){
                         worker.postMessage({
                             action: 'filter',
                             species: isSpeciesViewFiltered(true),
@@ -2141,18 +2141,37 @@ const GLOBAL_ACTIONS = { // eslint-disable-line
             }
         }
     },
-    KeyE: function (e) {
-        if (e.ctrlKey && region) exportAudio();
+    KeyC: function (e) {
+        // Center window on playhead
+        if (e.ctrlKey && currentBuffer) {
+            const saveBufferBegin = bufferBegin;
+            const middle = bufferBegin + wavesurfer.getCurrentTime();
+            bufferBegin = middle - windowLength / 2;
+            bufferBegin = Math.max(0, bufferBegin);
+            bufferBegin = Math.min(bufferBegin, currentFileDuration - windowLength)
+            // Move the region if needed
+            let region = getRegion();
+            if (region){
+                const shift = saveBufferBegin - bufferBegin;
+                region.start += shift;
+                region.end += shift;
+                if (region.start < 0 || region.end > windowLength) region = undefined;
+            }
+            postBufferUpdate({ begin: bufferBegin, position: 0.5, region: region, goToRegion: false})
+        }
     },
     KeyD: function (e) {
         if (e.ctrlKey && e.shiftKey) worker.postMessage({ action: 'convert-dataset' });
     },
-    KeyG: function (e) {
-        if (e.ctrlKey) showGoToPosition();
+    KeyE: function (e) {
+        if (e.ctrlKey && region) exportAudio();
     },
     KeyF: function (e) {
         if (e.ctrlKey) toggleFullscreen();
     },
+    KeyG: function (e) {
+        if (e.ctrlKey) showGoToPosition();
+    },
     KeyO: async function (e) {
         if (e.ctrlKey) await showOpenDialog();
     },
@@ -2167,6 +2186,9 @@ const GLOBAL_ACTIONS = { // eslint-disable-line
     KeyT: function (e) {
         if (e.ctrlKey) timelineToggle(true);
     },
+    KeyZ: function (e) {
+        if (e.ctrlKey && DELETE_HISTORY.length) insertManualRecord(...DELETE_HISTORY.pop());
+    },
     Escape: function () {
         if (PREDICTING) {
             console.log('Operation aborted');
@@ -2193,25 +2215,6 @@ const GLOBAL_ACTIONS = { // eslint-disable-line
             postBufferUpdate({ begin: bufferBegin, position: 1 })
         }
     },
-    KeyC: function (e) {
-        // Center window on playhead
-        if (e.ctrlKey && currentBuffer) {
-            const saveBufferBegin = bufferBegin;
-            const middle = bufferBegin + wavesurfer.getCurrentTime();
-            bufferBegin = middle - windowLength / 2;
-            bufferBegin = Math.max(0, bufferBegin);
-            bufferBegin = Math.min(bufferBegin, currentFileDuration - windowLength)
-            // Move the region if needed
-            let region = getRegion();
-            if (region){
-                const shift = saveBufferBegin - bufferBegin;
-                region.start += shift;
-                region.end += shift;
-                if (region.start < 0 || region.end > windowLength) region = undefined;
-            }
-            postBufferUpdate({ begin: bufferBegin, position: 0.5, region: region, goToRegion: false})
-        }
-    },
     PageUp: function () {
         if (currentBuffer) {
             const position = wavesurfer.getCurrentTime() / windowLength;
@@ -2327,7 +2330,13 @@ const GLOBAL_ACTIONS = { // eslint-disable-line
             activeRow.focus();
             if (!activeRow.classList.contains('text-bg-dark')) activeRow.click();
         }
-    }
+    },
+    Delete: function () {
+        if (activeRow) deleteRecord(activeRow);
+    },
+    Backspace: function () {
+        if (activeRow) deleteRecord(activeRow);
+    },
 };
 
 //returns a region object with the start and end of the region supplied
@@ -2902,7 +2911,8 @@ function setClickedIndex(target) {
 }
 
 const deleteRecord = (target) => {
-    if (target instanceof PointerEvent) target = activeRow;
+    if (target === activeRow) {}
+    else if (target instanceof PointerEvent) target = activeRow;
     else {
         target.forEach(position => {
             const [start, end] = position;
@@ -2923,6 +2933,14 @@ const deleteRecord = (target) => {
     const [file, start, end,] = unpackNameAttr(target);
     const setting = target.closest('table');
     const row = target.closest('tr');
+    let cname = target.querySelector('.cname').innerText;
+    let [species, confidence] = cname.split('\n');
+    confidence = parseInt(confidence.replace('%', '')) * 10;
+    const comment = target.querySelector('.comment').innerText;
+    const label = target.querySelector('.label').innerText;
+    let callCount = target.querySelector('.call-count').innerText;
+    callCount = callCount.replace('Present', '');
+    DELETE_HISTORY.push([species, start, end, comment, callCount, label, null, null, null, confidence])
 
     worker.postMessage({
         action: 'delete',
@@ -3712,7 +3730,7 @@ async function createContextMenu(e) {
         }
     }
     if (region === undefined && ! inSummary) return;
-    const createOrEdit = (['archive', 'explore'].includes(STATE.mode)) && (region?.attributes.label || target.closest('#summary')) ? 'Edit' : 'Create';
+    //const createOrEdit = (['archive', 'explore'].includes(STATE.mode)) && (region?.attributes.label || target.closest('#summary')) ? 'Edit' : 'Create';
 
     menu.html(`
         <a class="dropdown-item play ${hideInSummary}"><span class='material-symbols-outlined'>play_circle</span> Play</a>
@@ -3721,7 +3739,7 @@ async function createContextMenu(e) {
         </a>
         <div class="dropdown-divider ${hideInSummary}"></div>
         <a class="dropdown-item" id="create-manual-record" href="#">
-            <span class="material-symbols-outlined">post_add</span> ${createOrEdit} Archive Record${plural}
+            <span class="material-symbols-outlined">edit_document</span> Edit Record${plural}
         </a>
         <a class="dropdown-item" id="context-create-clip" href="#">
             <span class="material-symbols-outlined">music_note</span> Export Audio Clip${plural}
@@ -3860,33 +3878,22 @@ recordEntryForm.addEventListener('submit', function (e) {
 })
 
 
-const insertManualRecord = (cname, start, end, comment, count, label, action, batch, originalCname) => {
+const insertManualRecord = (cname, start, end, comment, count, label, action, batch, originalCname, confidence) => {
     const files = batch ? fileList : currentFile;
-    const insert = (toDisk) => {
-        worker.postMessage({
-            action: 'insert-manual-record',
-            cname: cname,
-            originalCname: originalCname,
-            start: start?.toFixed(3),
-            end: end?.toFixed(3),
-            comment: comment,
-            count: count || null,
-            file: files,
-            label: label,
-            DBaction: action,
-            batch: batch,
-            toDisk: toDisk
-        })
-
-    }
-    if (STATE.mode === 'analyse') {
-        //Update the record in the memory db 
-        insert(false)
-    }
-    // Insert to disk
-    setTimeout(insert, 500, true)
-    //insert(true)
-
+    worker.postMessage({
+        action: 'insert-manual-record',
+        cname: cname,
+        originalCname: originalCname,
+        start: start?.toFixed(3),
+        end: end?.toFixed(3),
+        comment: comment,
+        count: count || null,
+        file: files,
+        label: label,
+        DBaction: action,
+        batch: batch,
+        confidence: confidence
+    })
 }
 
 
diff --git a/js/worker.js b/js/worker.js
index 2fc66072..baea422b 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -241,7 +241,7 @@ async function handleMessage(e) {
             convertSpecsFromExistingSpecs();
             break;
         case 'create-dataset':
-            saveResults2DataSet();
+            saveResults2DataSet(args);
             break;
         case 'delete':
             await onDelete(args)
@@ -271,13 +271,16 @@ async function handleMessage(e) {
         case 'get-locations':
             getLocations({ db: STATE.db, file: args.file });
             break;
+        case 'get-valid-files-list':
+            await getFiles(args.files)
+            break;
         case 'insert-manual-record':
             const count = await onInsertManualRecord(args);
-            if (STATE.mode !== 'explore' && !args.batch && args.toDisk) {
+            if (STATE.mode !== 'explore' && !args.batch) {
                 UI.postMessage({
                     event: 'generate-alert',
                     message: `${count} ${args.cname} record has been saved to the archive.`,
-                    savedToDB: true
+                    filter: true
                 })
             }
             break;
@@ -299,9 +302,6 @@ async function handleMessage(e) {
             if (predictWorkers.length) terminateWorkers();
             spawnWorkers(args.model, args.list, BATCH_SIZE, args.threads);
             break;
-        case 'get-valid-files-list':
-            await getFiles(args.files)
-            break;
         case 'post':
             await uploadOpus(args);
             break;
@@ -1303,14 +1303,14 @@ const convertSpecsFromExistingSpecs = async (path) => {
     }
 }
 
-const saveResults2DataSet = (rootDirectory) => {
-    if (!rootDirectory) rootDirectory = '/mnt/608E21D98E21A88C/Users/simpo/PycharmProjects/Data/test';
+const saveResults2DataSet = ({species}) => {
+    const rootDirectory = 'C:/Users/simpo/PycharmProjects/Data/test';
     const height = 256, width = 384;
     let t0 = Date.now()
     let promise = Promise.resolve();
     let promises = [];
     let count = 0;
-    const db2ResultSQL = `SELECT DISTINCT dateTime AS timestamp, 
+    let db2ResultSQL = `SELECT DISTINCT dateTime AS timestamp, 
     files.duration, 
     files.filestart,
     files.name AS file, 
@@ -1326,8 +1326,12 @@ const saveResults2DataSet = (rootDirectory) => {
                             JOIN files ON records.fileID = files.id
                           WHERE speciesID NOT IN (${prepParams(STATE.blocked)}) 
                           AND confidence >= ${STATE.detect.confidence}`;
-
-    memoryDB.each(db2ResultSQL, ...STATE.blocked, async (err, result) => {
+    let params = STATE.blocked;
+    if (species) {
+        db2ResultSQL += ` AND species.cname = ?`;
+        params.push(species)
+    }
+    memoryDB.each(db2ResultSQL, ...params, async (err, result) => {
         // Check for level of ambient noise activation
         let ambient, threshold, value = 50;
         // adding_chirpity_additions is a flag for curated files, if true we assume every detection is correct
@@ -1348,9 +1352,12 @@ const saveResults2DataSet = (rootDirectory) => {
         promise = promise.then(async function () {
             let score = result.score;
             if (score >= threshold) {
-                const [_, folder] = p.dirname(result.file).match(/^.*\/(.*)$/)
+                const folders = p.dirname(result.file).split(p.sep); //.match(/^.*\/(.*)$/)
+                species = result.cname.replaceAll(' ', '_');
+                const sname = result.sname.replaceAll(' ', '_');
+                const folder = `${species}~${sname}`;
                 // get start and end from timestamp
-                const start = (result.timestamp - result.filestart) / 1000;
+                const start = result.position;
                 let end = start + 3;
 
                 // filename format: <source file>_<confidence>_<start>.png
@@ -1621,8 +1628,8 @@ const insertRecord = async (timestamp, key, speciesID, confidence, file) => {
         null, null, key + 3, null, isDaylight);
 }
 
-async function batchInsertRecords(cname, label, toDisk, files, originalCname) {
-    const db = toDisk ? diskDB : memoryDB;
+async function batchInsertRecords(cname, label, files, originalCname) {
+    const db = STATE.db;
     let params = [originalCname, STATE.detect.confidence];
     t0 = Date.now();
     let query = `
@@ -1657,7 +1664,6 @@ async function batchInsertRecords(cname, label, toDisk, files, originalCname) {
             count: callCount,
             file: name,
             label: label,
-            toDisk: toDisk,
             batch: false,
             originalCname: undefined
         })
@@ -1665,14 +1671,15 @@ async function batchInsertRecords(cname, label, toDisk, files, originalCname) {
     await db.runAsync('END');
     console.log(`Batch record update  took ${(Date.now() - t0) / 1000} seconds`)
     if (STATE.mode !== 'explore' && toDisk) UI.postMessage({ event: 'generate-alert', message: `${count} ${cname} records have been saved to the archive.`, savedToDB: true })
+
 }
 
-const onInsertManualRecord = async ({ cname, start, end, comment, count, file, label, toDisk, batch, originalCname }) => {
-    if (batch) return batchInsertRecords(cname, label, toDisk, file, originalCname)
+const onInsertManualRecord = async ({ cname, start, end, comment, count, file, label, batch, originalCname, confidence }) => {
+    if (batch) return batchInsertRecords(cname, label, file, originalCname)
     start = parseFloat(start), end = parseFloat(end);
     const startMilliseconds = Math.round(start * 1000);
     let changes, fileID, fileStart;
-    const db = toDisk ? diskDB : memoryDB;
+    const db = STATE.db; // toDisk ? diskDB : memoryDB;
     const { speciesID } = await db.getAsync(`SELECT id as speciesID FROM species
                                         WHERE cname = ?`, cname);
     let res = await db.getAsync(`SELECT id,filestart FROM files WHERE name = ?`, file);
@@ -1706,10 +1713,11 @@ const onInsertManualRecord = async ({ cname, start, end, comment, count, file, l
     let response;
     const dateTime = fileStart + startMilliseconds;
     const isDaylight = isDuringDaylight(dateTime, STATE.lat, STATE.lon);
+    confidence = confidence || 2000;
     response = await db.runAsync('INSERT OR REPLACE INTO records VALUES ( ?,?,?,?,?,?,?,?,?,?)',
-        dateTime, start, fileID, speciesID, 2000, label, comment, end, parseInt(count), isDaylight);
+        dateTime, start, fileID, speciesID, confidence, label, comment, end, parseInt(count), isDaylight);
 
-    if (response.changes && toDisk) {
+    if (response.changes && STATE.db === diskDB) {
         UI.postMessage({ event: 'diskDB-has-records' });
     } else {
         UI.postMessage({event: 'unsaved-records'});