improvement in resolve phrase and aya_tokens