Mostly vim and mutt improvements