map eviction improvements cont