diff --git a/lib/history.sh b/lib/history.sh
index 938a184..73822df 100644
--- a/lib/history.sh
+++ b/lib/history.sh
@@ -1,3 +1,5 @@
+shopt -s histappend # append to bash_history if Terminal.app quits
+
 ## Command history configuration
 if [ -z "$HISTFILE" ]; then
     HISTFILE=$HOME/.bash_history
diff --git a/plugins/git/git.plugin.sh b/plugins/git/git.plugin.sh
index 98d9278..cce81b7 100644
--- a/plugins/git/git.plugin.sh
+++ b/plugins/git/git.plugin.sh
@@ -75,7 +75,7 @@ alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
 alias gcount='git shortlog -sn'
-#compdef _git gcount
+#compdef _git gcount complete -F _git gcount
 alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'
 alias gcpc='git cherry-pick --continue'
@@ -87,14 +87,18 @@ alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 alias gdw='git diff --word-diff'
 
-gdv() { git diff -w "$@" | view - }
+gdv() {
+  git diff -w "$@" | view -
+}
 #compdef _git gdv=git-diff
 
 alias gf='git fetch'
 alias gfa='git fetch --all --prune'
 alias gfo='git fetch origin'
 
-function gfg() { git ls-files | grep $@ }
+gfg() {
+  git ls-files | grep "$@"
+}
 #compdef _grep gfg
 
 alias gg='git gui citool'