diff --git a/lua/core/autocmd.lua b/lua/core/autocmd.lua
index 2be4ccc..256ae3f 100644
--- a/lua/core/autocmd.lua
+++ b/lua/core/autocmd.lua
@@ -3,8 +3,28 @@
 -- Highlight when yanking (copying) text
 vim.api.nvim_create_autocmd('TextYankPost', {
   desc = 'Highlight when yanking (copying) text',
-  group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
+  group = vim.api.nvim_create_augroup('highlight-yank', { clear = true }),
+  callback = function() vim.highlight.on_yank() end,
+})
+
+vim.api.nvim_create_autocmd('FileType', {
+  group = vim.api.nvim_create_augroup('close-with-q', { clear = true }),
+  pattern = {
+    'qf',
+    'help',
+    'man',
+    'lspinfo',
+    'checkhealth',
+    'fugitive',
+  },
+  callback = function() vim.keymap.set('n', 'q', ':close<CR>', { buffer = true, silent = true }) end,
+})
+
+vim.api.nvim_create_autocmd('BufReadPost', {
+  group = vim.api.nvim_create_augroup('jump-to-last-position', { clear = true }),
   callback = function()
-    vim.highlight.on_yank()
+    local mark = vim.api.nvim_buf_get_mark(0, '"')
+    local lcount = vim.api.nvim_buf_line_count(0)
+    if mark[1] > 0 and mark[1] <= lcount then pcall(vim.api.nvim_win_set_cursor, 0, mark) end
   end,
 })