Better add to contacts, still a few bugs