Little fixes and show the map