fix multiple contacts and token limits