add more diff support back in, and a couple useful key mappings