Final touches to client AI