diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index 3252510..6bcc158 100755
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -103,6 +103,7 @@ abbr shrm "shred-rm"
 abbr thes "thesaurus"
 abbr ut "unix-timestamp"
 abbr uzr "unzip-rm"
+abbr vsnp "vim-snippet"
 abbr fvft "find-vim-filetype"
 
 # ]]] fxn abbr's #
diff --git a/dot_config/fish/functions/vsnp.fish b/dot_config/fish/functions/vim-snippet.fish
similarity index 83%
rename from dot_config/fish/functions/vsnp.fish
rename to dot_config/fish/functions/vim-snippet.fish
index 3ef57ef..9518bd5 100755
--- a/dot_config/fish/functions/vsnp.fish
+++ b/dot_config/fish/functions/vim-snippet.fish
@@ -1,4 +1,4 @@
-function vsnp
+function vim-snippet
 	set snips_dir "/home/kevin/.vim/plugged/vim-snippets/UltiSnips"
 	$EDITOR $snips_dir/$argv[1].snippets
 end
diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
index 7a5cbda..dde02a2 100755
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -1,15 +1,19 @@
 #  startup [[[ # 
 
+set $term urxvt
+set $term_alt st
+# set $term st
+# set $term_alt urxvt
 {{ if eq .chezmoi.fullHostname "x1-carbon" }}
 exec dunst
 exec compton
 exec imwheel
-exec numlockx on
+xec numlockx on
 exec xbacklight -set 10
 # exec wal -i "$(/home/kevin/scripts/shuffler \"/home/kevin/Pictures/Backgrounds/dim/non-editing\")"
 exec wal -i $(/home/kevin/scripts/shuffler "$HOME/Pictures/Backgrounds/dim/non-editing")
 {{ end }}
-exec --no-startup-id i3-msg 'workspace $ws2; exec $term'
+# exec --no-startup-id i3-msg 'workspace $ws2; exec $term'
 exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
 
 #  ]]] startup # 
@@ -19,10 +23,6 @@ exec --no-startup-id i3-msg 'workspace $ws3; exec $browser'
 set $mod Mod1
 set $browser "firefox"
 # set $browser "chromium"
-# set $term st
-# set $term_alt urxvt
-set $term urxvt
-set $term_alt st
 set $scripts_path "/home/kevin/scripts"
 set $sch_dir "$HOME/Documents/School"
 
diff --git a/dot_config/i3blocks/i3blocks.conf.tmpl b/dot_config/i3blocks/i3blocks.conf.tmpl
index 2de5842..99ef437 100755
--- a/dot_config/i3blocks/i3blocks.conf.tmpl
+++ b/dot_config/i3blocks/i3blocks.conf.tmpl
@@ -68,6 +68,11 @@ WIDTH=220
 #  sys.monitoring [[[ # 
 
 {{ if eq .chezmoi.fullHostname "nzxt" }}
+[wifi]
+label= 
+instance=wlp4s0
+interval=10
+
 [temperature]
 label= 
 interval=5
diff --git a/dot_config/i3blocks/scripts/executable_wifi b/dot_config/i3blocks/scripts/executable_wifi
index 34b7e04..ef2c0aa 100755
--- a/dot_config/i3blocks/scripts/executable_wifi
+++ b/dot_config/i3blocks/scripts/executable_wifi
@@ -29,7 +29,7 @@ INTERFACE="${BLOCK_INSTANCE:-wlan0}"
 
 #------------------------------------------------------------------------
 
-QUALITY=$(grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }')
+QUALITY=$(sudo grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }')
 # echo $QUALITY
 W_inter=$(ip link | grep "[1-9]: wlp" | cut -d " " -f2 | tr -d ':')
 W_name=$(nmcli d | grep "$W_inter" | awk '{print $4}')
diff --git a/dot_config/mpv/mpv.conf b/dot_config/mpv/mpv.conf
new file mode 100644
index 0000000..dc1f891
--- /dev/null
+++ b/dot_config/mpv/mpv.conf
@@ -0,0 +1,3 @@
+sub-auto=fuzzy
+ytdl-format=best
+ytdl-raw-options=sub-format=en,write-srt=
diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl
index 5ecd07d..3774ace 100755
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -30,7 +30,8 @@ set tw=75
 set undodir=~/.vim/undo
 set undofile
 " set updatetime=1000
-set updatetime=500
+" set updatetime=500
+set updatetime=0
 
 autocmd VimResized * wincmd =
 filetype plugin on
@@ -58,6 +59,7 @@ autocmd FileType *css,htmldjango,html,javascript,json,markdown,tex,text,yaml set
 " autocmd Filetype html set foldmarker=0
 autocmd BufNewFile,BufRead *.gd set expandtab!
 autocmd Filetype go set expandtab! sw=4
+autocmd Filetype markdown set commentstring=<!---\ %s\ -->
 autocmd Filetype markdown map <F8> :LivedownToggle<CR>
 autocmd Filetype markdown nnoremap <Tab> <Esc>>>A
 autocmd Filetype markdown inoremap <S-Tab> <Esc><<A
@@ -140,13 +142,16 @@ Plug '907th/vim-auto-save'
 Plug 'lervag/vimtex'
 	" au BufWritePost *.tex silent call Tex_RunLaTeX()
 	au BufWritePost *.tex silent !pkill -USR1 xdvi.bin
+	let g:Tex_MultipleCompileFormats = 'dvi,pdf'
 	let g:vimtex_view_general_viewer = 'zathura'
     let g:vimtex_quickfix_latexlog = {
           \ 'overfull' : 0,
           \ 'underfull' : 0,
           \ 'global' : 0,
+          \ 'references' : 0,
           \ 'unused' : 0,
           \}
+    let g:vimtex_quickfix_autoclose_after_keystrokes = 5
     " let g:vimtex_compiler_latexmk = {
         " \ 'continuous' : 0,
         " \}
@@ -256,13 +261,21 @@ call plug#end()
 " colorscheme gotham256
 colorscheme wal
 
-nnoremap Q @@
+" normal mappings [[[ "
 
 nnoremap v <C-V>
+nnoremap Q @@
+
+" folds
+nnoremap , za
+
+" indenting
 nnoremap > >>
 nnoremap < <<
 inoremap << <Esc><<A
 
+" ]]] normal mappings "
+
 " leader mappings [[[ "
 let mapleader="\<Space>"
 
@@ -274,8 +287,10 @@ nnoremap <leader>c c$
 nnoremap <leader>d d$
 " delete entire buffer
 nnoremap <leader>dg ggdG
+" delete entire line
+nnoremap <leader>dl 0d$
 " delete lines matching pattern
-nnoremap <leader>dl :g//d<left><left>
+nnoremap <leader>dls :g//d<left><left>
 " show docstring for cur word
 nnoremap <leader>do :YcmCompleter GetDoc<CR>
 " delete line into system clipboard
@@ -291,8 +306,9 @@ nnoremap <leader>fmi :set foldmethod=indent<CR> zM
 nnoremap <leader>fmm :set foldmethod=marker<CR> zM
 " add marker foldmethod modeline
 nnoremap <leader>fi :YcmCompleter FixIt<CR>
-" find copied text
-nnoremap <leader>ft :se ft?
+" check filetype
+nnoremap <leader>ft :se ft?<CR>
+" check todo's
 nnoremap <leader>ftd /TODO<CR>
 nnoremap <leader>g :YcmCompleter GoTo<CR>
 " vimdiff split
@@ -317,6 +333,8 @@ vnoremap <leader>n q:anorm
 nnoremap <leader>nw :set nowrap<CR>
 " check if in neovim
 nnoremap <leader>nv :echo has('nvim')<CR>
+" open fold recursively
+nnoremap <leader>o zO
 " Plug commands
 nnoremap <leader>p "*p
 nnoremap <leader>pli :PlugInstall<CR>
diff --git a/key_aliases.tmpl b/key_aliases.tmpl
index ace0576..3f326f8 100755
--- a/key_aliases.tmpl
+++ b/key_aliases.tmpl
@@ -159,7 +159,8 @@ xya "yay -Qqne > ~/{{ .chezmoi.os }}-config/txt/{{ .chezmoi.fullHostname }}-pkgs
 {{ end }}
 
 py "python"
-pyt "python -m unittest"
+pyt "pytest -vv"
+pyu "python -m unittest"
 pipi "pip install"
 spipi "sudo pip install"
 
@@ -206,6 +207,7 @@ r "ranger"
 rg "printf '\033c' && rg"
 rx "redshift -x"
 sn "sudo nvim"
+sw "swex"
 vmd "vimdiff"
 wg "wego"
 wp "grep wallpaper ~/.cache/wal/colors.sh"
@@ -493,7 +495,7 @@ ssc "ssh mokkar@teach.cs.utoronto.ca"
 jc "javac -d out *.java"
 jr "java -cp \"$CLASSPATH:out\""
 
-wl2 "watson log --all --project=263 --tag=a2"
-wr2 "watson report --all --project=263 --tag=a2"
+wl6 "watson log --all --project=263 --tag=a3"
+wr6 "watson report --all --project=263 --tag=a3"
 
 # ]]] school  #
diff --git a/key_dirs.tmpl b/key_dirs.tmpl
index 203b0ea..a481270 100755
--- a/key_dirs.tmpl
+++ b/key_dirs.tmpl
@@ -49,6 +49,7 @@ mh ~/coding/mf-site/layouts
 snp ~/.vim/plugged/vim-snippets/UltiSnips
 sv ~/coding/spotify-lib-vis/src
 svg ~/coding/spotify-lib-vis/src/graphs/static/graphs/scripts
+swd ~/coding/swex
 tb ~/coding/trapbot/src/trapbot
 wo ~/Documents/workout-logs/11
 {{ end }}
@@ -61,9 +62,10 @@ sc ~/school
 lt ~/school/latex-notes
 
 6 ~/school/263
-62 ~/school/263/a2
-624 ~/school/263/a2/q4
-62t ~/school/latex-notes/263/a2
+63 ~/school/263/a3
+631 ~/school/263/a3/q1
+632 ~/school/263/a3/q2
+63t ~/school/latex-notes/263/a3
 
 al1 ~/school/algorithms/w1-union-find
 
diff --git a/scripts/executable_change-sink b/scripts/executable_change-sink
index 937cbb8..598364e 100755
--- a/scripts/executable_change-sink
+++ b/scripts/executable_change-sink
@@ -13,13 +13,6 @@ case $1 in
 		# devicename="alsa_output.pci-0000_00_14.2.iec958-stereo"
 		;;
 esac
-# if [ "$1" = "dac" ]; then
-	# devicename="alsa_output.usb-FiiO_DigiHug_USB_Audio-01.analog-stereo"
-# elif [ "$1" = "dac2" ]; then
-	# devicename="alsa_output.usb-1852_DigiHug_USB_Audio-01.analog-stereo"
-# elif [ "$1" = "line-out" ]; then
-	# devicename="alsa_output.pci-0000_00_14.2.analog-stereo"
-# fi
 echo "$devicename"
 
 #change the default sink