diff --git a/.bash_profile b/.bash_profile
index 6f9ea2f..865116d 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,14 +1,14 @@
 # if running bash
 if [ -n "$BASH_VERSION" ] &&  [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
+	source "$HOME/.bashrc"
 fi
 
 # set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
+if [ -d "$HOME/bin" ]; then
 	PATH="$HOME/bin:$PATH"
 fi
 
 # start gui
-if [ -z $DISPLAY ]; then
+if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq "1" ]; then
 	exec startx
 fi
diff --git a/.bashrc b/.bashrc
index 39ef0a6..e8d1ccb 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,6 +1,3 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# also gets invoced for login shells by ~/.profile
-
 # If not running interactively, don't do anything
 [ -z "$PS1" ] && return
 
@@ -42,3 +39,4 @@ fi
 if [ -f ~/.bash_aliases ];	then source ~/.bash_aliases; fi
 if [ -f ~/.bash_env ];		then source ~/.bash_env; fi
 if [ -f ~/.bash_prompt ];	then source ~/.bash_prompt; fi
+if [ -f /etc/bash_completion ];	then source /etc/bash_completion; fi