some map improvements; leaving for now