more tpope goodness, ack tweaks