Minor cleanup and dotfiles