corrected some location errors