added some of tpope's wonderful tools