fixed some location stuff