add more tpope goodness