somewhat synchronizing with current version of the original dotfiles