added sources
fixed location data