some map improvements