location error and fixed some texts