trivial update with Melville, fixed maps, fixed pop counts