Bug fixing and adding in geocoded back to map