diff --git a/.bash_aliases b/.bash_aliases
index 9f3d972..c597ad3 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -19,7 +19,7 @@ alias wol_desktop="ssh knyf wol BC:5F:F4:74:74:57"
 alias dd_progress='sudo kill -USR1 $(pgrep ^dd)'
 alias co2="ssh knyf mhz14a -r -d /dev/ttyS0"
 alias h2o="ssh knyf 'cd configfiles/BME280; ./get_temperature_humidity_and_idead_humidity.sh'"
-function ack_open { nvim $( ack "$@" | grep -Po "^(?:lib|t|tmpl|python)/[^:]+:\d+" | tr '\n' ' ' ); }
+function ack_open { nvim $( ack -m 1 "$@" | grep -Po "^(?:lib|t|tmpl|python)/[^:]+:\d+" | tr '\n' ' ' ); }
 
 # git
 alias gst="git status"
@@ -33,11 +33,12 @@ function ggtl { ggt --color=always "$@" | less -R; }
 function ggpl { ggp --color=always "$@" | less -R; }
 
 # git grep colors
+git config --global pull.rebase true
 git config --global color.grep.filename "Green"
 git config --global color.grep.linenumber "Yellow"
 git config --global color.grep.match "bold #ff4d00"
 
-alias TODO="ggn 'TODO: jry:'"
+alias TODO="ggn 'TODO: jry'"
 
 title() {
     # set input argument as window title
@@ -117,13 +118,13 @@ if [ $USER = 'jry' ]; then
     alias perlperl="/home/perlrepo/perl-5.28.1/bin/perl -MJIX"
     alias perlprove="/home/perlrepo/perl-5.28.1/bin/prove"
     function prove { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL prove "$@"; }
-    function prove-on-backend { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL prove-on-backend "$@"; }
-    function perl { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL perl -MJIX "$@"; }
+    function prove-on-backend { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL USER=$USER JIX_USERID=$JIX_USERID prove-on-backend "$@"; }
+    function perl { jix-shell TEST_METHOD=$TEST_METHOD BAIL_ON_FAIL=$BAIL_ON_FAIL USER=$USER JIX_USERID=$JIX_USERID  perl -MJIX "$@"; }
     alias open_url="jix-shell open_url"
     alias colorlog="jix-shell colorlog.pl"
     alias jix-gettext="jix-shell jix-gettext"
     alias arc="jix-shell arc"
-    alias solr="ssh -L 1214:localhost:8983 solr@gnu.jobsafari.dk firefox http://localhost:1214/solr/"
+    alias solr="ssh -L 1214:localhost:8983 solr@gnu.dev.job.dk firefox http://localhost:1214/solr/"
 
     function profiling {
         local ROOT=$1;