Map and Small changes

Updated map and small changes