diff --git a/lua/pending/buffer.lua b/lua/pending/buffer.lua
index 827ff82..adcf2dc 100644
--- a/lua/pending/buffer.lua
+++ b/lua/pending/buffer.lua
@@ -133,6 +133,7 @@ function M.open_line(above)
   local insert_row = above and (row - 1) or row
   vim.bo[bufnr].modifiable = true
   vim.api.nvim_buf_set_lines(bufnr, insert_row, insert_row, false, { '- [ ] ' })
+  table.insert(_meta, insert_row + 1, { type = 'task' })
   vim.api.nvim_win_set_cursor(0, { insert_row + 1, 6 })
   vim.cmd('startinsert!')
 end
diff --git a/lua/pending/init.lua b/lua/pending/init.lua
index 36f5282..0fd3a98 100644
--- a/lua/pending/init.lua
+++ b/lua/pending/init.lua
@@ -83,6 +83,16 @@ local function _save_and_notify()
   M._recompute_counts()
 end
 
+---@return boolean
+local function require_saved()
+  local bufnr = buffer.bufnr()
+  if bufnr and vim.bo[bufnr].modified then
+    log.warn('save changes first (:w)')
+    return false
+  end
+  return true
+end
+
 ---@return pending.Counts
 function M.counts()
   if not _counts then
@@ -175,6 +185,9 @@ end
 ---@param pred_str string
 ---@return nil
 function M.filter(pred_str)
+  if not require_saved() then
+    return
+  end
   if pred_str == 'clear' or pred_str == '' then
     buffer.set_filter({}, {})
     local bufnr = buffer.bufnr()
@@ -232,7 +245,7 @@ end
 function M._setup_buf_mappings(bufnr)
   local cfg = require('pending.config').get()
   local km = cfg.keymaps
-  local opts = { buffer = bufnr, silent = true }
+  local opts = { buffer = bufnr, silent = true, nowait = true }
 
   ---@type table<string, fun()>
   local actions = {
@@ -243,6 +256,9 @@ function M._setup_buf_mappings(bufnr)
       M.toggle_complete()
     end,
     view = function()
+      if not require_saved() then
+        return
+      end
       buffer.toggle_view()
     end,
     priority = function()
@@ -255,6 +271,9 @@ function M._setup_buf_mappings(bufnr)
       M.undo_write()
     end,
     filter = function()
+      if not require_saved() then
+        return
+      end
       vim.ui.input({ prompt = 'Filter: ' }, function(input)
         if input then
           M.filter(input)
@@ -370,6 +389,9 @@ end
 
 ---@return nil
 function M.undo_write()
+  if not require_saved() then
+    return
+  end
   local s = get_store()
   local stack = s:undo_stack()
   if #stack == 0 then
@@ -388,6 +410,9 @@ function M.toggle_complete()
   if not bufnr then
     return
   end
+  if not require_saved() then
+    return
+  end
   local row = vim.api.nvim_win_get_cursor(0)[1]
   local meta = buffer.meta()
   if not meta[row] or meta[row].type ~= 'task' then
@@ -430,13 +455,30 @@ function M.toggle_complete()
   end
 end
 
----@param id_str string
+---@param id_str? string
 ---@return nil
 function M.done(id_str)
-  local id = tonumber(id_str)
-  if not id then
-    log.error('Invalid task ID: ' .. tostring(id_str))
-    return
+  local id
+  if not id_str or id_str == '' then
+    if not require_saved() then
+      return
+    end
+    local row = vim.api.nvim_win_get_cursor(0)[1]
+    local meta = buffer.meta()
+    if not meta[row] or meta[row].type ~= 'task' then
+      log.error('Cursor is not on a task line.')
+      return
+    end
+    id = meta[row].id
+    if not id then
+      return
+    end
+  else
+    id = tonumber(id_str)
+    if not id then
+      log.error('Invalid task ID: ' .. tostring(id_str))
+      return
+    end
   end
   local s = get_store()
   s:load()
@@ -478,6 +520,9 @@ function M.toggle_priority()
   if not bufnr then
     return
   end
+  if not require_saved() then
+    return
+  end
   local row = vim.api.nvim_win_get_cursor(0)[1]
   local meta = buffer.meta()
   if not meta[row] or meta[row].type ~= 'task' then
@@ -510,6 +555,9 @@ function M.prompt_date()
   if not bufnr then
     return
   end
+  if not require_saved() then
+    return
+  end
   local row = vim.api.nvim_win_get_cursor(0)[1]
   local meta = buffer.meta()
   if not meta[row] or meta[row].type ~= 'task' then
diff --git a/lua/pending/views.lua b/lua/pending/views.lua
index 87fcee1..3b67f90 100644
--- a/lua/pending/views.lua
+++ b/lua/pending/views.lua
@@ -156,6 +156,7 @@ function M.category_view(tasks)
         raw_due = task.due,
         status = task.status,
         category = cat,
+        priority = task.priority,
         overdue = task.status == 'pending' and task.due ~= nil and parse.is_overdue(task.due)
           or nil,
         recur = task.recur,
@@ -207,6 +208,7 @@ function M.priority_view(tasks)
       raw_due = task.due,
       status = task.status,
       category = task.category,
+      priority = task.priority,
       overdue = task.status == 'pending' and task.due ~= nil and parse.is_overdue(task.due) or nil,
       show_category = true,
       recur = task.recur,