made changes based on https://github.com/jm3/dotfiles