added location and made other changes