Improve phrases/location