More AI improvements