Some text changes and location (pending)