fixed some location issues