corrected some location stuff