diff --git a/.vimrc b/.vimrc
index 0e6996c..2f4daf3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -292,6 +292,9 @@ let g:ctrlp_cmd = 'CtrlP'
 let g:ctrlp_working_path_mode = 'ra'
 let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15'
 
+" * Vim-Go
+let g:go_fmt_command = "goimports"
+
 
 " ** STATUSLINE **
 "
@@ -567,3 +570,4 @@ endif
 " ** SEE ALSO **
 " filetype.vim
 
+command Comments lexpr system('/home/barak/src/gogh/src/github.com/barakmich/gogh/gogh')
diff --git a/.xinitrc b/.xinitrc
index 8eac5ad..77f577b 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,7 +3,6 @@
 xrdb -merge .Xdefaults &
 
 gnome-settings-daemon & 
-eval $(cat ~/.fehbg) &
 xscreensaver -no-splash &
 kupfer --no-splash &
 nm-applet &
@@ -15,5 +14,7 @@ if [ -f ~/.xrandrrc ]; then
     ~/.xrandrrc
 fi
 
+eval $(cat ~/.fehbg) &
 #exec awesome
-exec i3
+#exec i3
+exec dbus-launch --sh-syntax --exit-with-session i3