fixed some location problems