Changed misc map variables to map.state