diff --git a/bashrc b/bashrc
index faef485..d20594c 100644
--- a/bashrc
+++ b/bashrc
@@ -159,6 +159,8 @@ if [[ -n ${comp_enabled} && -r ${completion_path} ]]; then
 	source ${completion_path}
 fi
 if [[ -n ${git_enabled} && -r ${git_prompt_path} ]]; then
+	GIT_PROMPT_FETCH_REMOTE_STATUS=0
+	GIT_PROMPT_SHOW_UPSTREAM=1
 	GIT_PROMPT_ONLY_IN_REPO=1
 	source ${git_prompt_path}
 	# theme overrides
diff --git a/vimrc b/vimrc
index 805b1c7..b5e783a 100644
--- a/vimrc
+++ b/vimrc
@@ -17,10 +17,11 @@ set sidescrolloff=15
 set sidescroll=1
 " disable bell
 set noerrorbells visualbell t_vb=
-" indentation
-set shiftwidth=3
-set tabstop=3
-set noexpandtab
+" indentation_RIP
+"set shiftwidth=3 tabstop=3 noexpandtab
+" indentation_OK
+set tabstop=3 softtabstop=4 shiftwidth=4 colorcolumn=81 smarttab expandtab
+
 set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
 
 " 256 colours at almost all times
@@ -40,8 +41,6 @@ autocmd BufNewFile *.rb 0put =\"#!/usr/bin/env ruby\<nl>\"|$
 autocmd BufNewFile *.py 0put =\"#!/usr/bin/env python3\<nl>\"|$
 autocmd BufNewFile *.pl 0put =\"#!/usr/bin/env perl\<nl>\use strict;\<nl>\use warnings;\<nl>\use feature 'say';\<nl>\"|$
 
-autocmd FileType python setlocal softtabstop=4 shiftwidth=4 colorcolumn=80 smarttab expandtab autoindent
-
 " maps
 let mapleader = ","
 noremap <F1> <Esc>