user update fix and map changes