More map fixes (adjacency lists, highlighting)