Some .dotfiles + Some improvements