location stuff
merged
updating location works