Fixed wording and updating raw location too early