added some map stuff