made location stuff better
merged