fixing location stuff