better phone number handling
better intent handling