Few fixes to dotfiles and cleanup.