diff --git a/lua/harpoon/init.lua b/lua/harpoon/init.lua
index da7d550..7a988fe 100644
--- a/lua/harpoon/init.lua
+++ b/lua/harpoon/init.lua
@@ -34,17 +34,21 @@ function ensure_correct_config(config)
     local projects = config.projects
     if projects[cwd] == nil then
         projects[cwd] = {
-            marks = {},
-            term = {},
+            mark = {
+                marks = {}
+            },
+            term = {
+                cmds = {}
+            },
         }
     end
 
     if projects[cwd].marks == nil then
-        projects[cwd].marks = {}
+        projects[cwd].mark = {marks = {}}
     end
 
     if projects[cwd].term == nil then
-        projects[cwd].term = {}
+        projects[cwd].term = {cmds = {}}
     end
 end
 
@@ -110,5 +114,13 @@ M.setup = function(config)
     harpoon_config = complete_config
 end
 
+-- should only be called for debug purposes
+M.print_config = function() 
+    print(vim.inspect(harpoon_config))
+end
+
+-- Sets a default config with no values
+M.setup({projects = {}})
+
 return M
 
diff --git a/plugin/manage-a-mark.vim b/plugin/manage-a-mark.vim
deleted file mode 100644
index 25ccea4..0000000
--- a/plugin/manage-a-mark.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-augroup THE_PRIMEAGEN_HARPOON
-    autocmd!
-    autocmd VimLeave * :lua require('harpoon').save()
-    autocmd BufLeave * :lua require('harpoon.mark').store_offset()
-augroup END
diff --git a/plugin/mark.vim b/plugin/mark.vim
index 25ccea4..ad61764 100644
--- a/plugin/mark.vim
+++ b/plugin/mark.vim
@@ -1,5 +1,5 @@
 augroup THE_PRIMEAGEN_HARPOON
     autocmd!
-    autocmd VimLeave * :lua require('harpoon').save()
+    autocmd VimLeavePre * :lua require('harpoon').save()
     autocmd BufLeave * :lua require('harpoon.mark').store_offset()
 augroup END