Map update and minor changes