minor rework of exp/evict