diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 733ed79..684e4a3 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -127,3 +127,4 @@ bootable
 virtualized
 VM
 multithreading
+toolsets
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index c9558aa..998fe88 100644
Binary files a/vim/spell/en.utf-8.add.spl and b/vim/spell/en.utf-8.add.spl differ
diff --git a/vim/templates/c_header_notice b/vim/templates/c_header_notice
index 6988711..c8bf46e 100644
--- a/vim/templates/c_header_notice
+++ b/vim/templates/c_header_notice
@@ -1,7 +1,6 @@
-/*=======================================================================================
+/*==================================================================================================
   File:
   Creation Date:
-  Last Modified:
   Creator: Michael Campagnaro
   Notice: (C) Copyright $year by Jelly Pixel, Inc. All Rights Reserved.
-  =======================================================================================*/
+  ================================================================================================*/
diff --git a/vimrc b/vimrc
index 640df15..9cf55db 100644
--- a/vimrc
+++ b/vimrc
@@ -62,6 +62,7 @@ Plug 'tpope/vim-obsession' " Continuously updated session files
 Plug 'tpope/vim-fugitive' " Git wrapper
 Plug 'tpope/vim-classpath' " TODO: still need this?
 Plug 'junegunn/goyo.vim' " Distraction-free mode with centered buffer
+Plug 'fedorenchik/VimCalc3'
 
 " Automatically discover and 'properly' update ctags files on save
 Plug 'craigemery/vim-autotag'
@@ -325,9 +326,9 @@ augroup campoCmds
 
   " C/C++ template
   autocmd bufnewfile *.{c,cc,cpp,h,hpp} 0r ~/.vim/templates/c_header_notice
-  autocmd bufnewfile *.{c,cc,cpp,h,hpp} exe "2," . 7 . "g/File:.*/s//File: " .expand("%")
-  autocmd bufnewfile *.{c,cc,cpp,h,hpp} exe "2," . 7 . "g/Creation Date:.*/s//Creation Date: " .strftime("%Y-%m-%d")
-  autocmd bufnewfile *.{c,cc,cpp,h,hpp} exe "2," . 7 . "g/$year/s//" .strftime("%Y")
+  autocmd bufnewfile *.{c,cc,cpp,h,hpp} exe "2," . 6 . "g/File:.*/s//File: " .expand("%")
+  autocmd bufnewfile *.{c,cc,cpp,h,hpp} exe "2," . 6 . "g/Creation Date:.*/s//Creation Date: " .strftime("%Y-%m-%d")
+  autocmd bufnewfile *.{c,cc,cpp,h,hpp} exe "2," . 6 . "g/$year/s//" .strftime("%Y")
   function! s:InsertHeaderGates()
     let gatename = substitute(toupper(expand("%:t")), "\\.", "_", "g")
     execute "normal! ggO#ifndef " . gatename
@@ -744,19 +745,28 @@ function! HideBuildResultsAndClearErrors()
   call asyncrun#quickfix_toggle(g:build_window_size, 0)
 endfunction
 
+function! HideAsyncResults()
+  call asyncrun#quickfix_toggle(g:build_window_size, 0)
+endfunction
+
 function! ToggleBuildResults()
   call asyncrun#quickfix_toggle(g:build_window_size)
 endfunction
 
 function! StopRunTask()
   AsyncStop
-  call asyncrun#quickfix_toggle(g:build_window_size, 0)
+  call HideAsyncResults()
 endfunction
 
 function! ExecuteRunScript()
   exec "AsyncRun! -post=call\\ StopRunTask() ./run"
 endfunction
 
+function! SilentBuild()
+  AsyncStop
+  exec "AsyncRun! -save=2 -post=call\\ HideAsyncResults() ./build*"
+endfunction
+
 " Show results window the moment the async job starts
 augroup vimrc
   autocmd User AsyncRunStart call asyncrun#quickfix_toggle(g:build_window_size, 1)
@@ -771,7 +781,7 @@ noremap <F10> :call HideBuildResultsAndClearErrors()<cr>
 
 " Execute build script
 nnoremap <leader>b :AsyncRun! -save=2 ./build*<cr>
-nnoremap <F8> :AsyncRun! -save=2 ./build*<cr>
+nnoremap <F8> :call SilentBuild()<cr>
 
 " Execute run script
 nnoremap <leader>br :call ExecuteRunScript()<cr>