fix bugs and load images on map