Changed some things in preperation for emacs as different path