reset values when starting a new map, other small fixes