fixed some locations