added more map stuff