WIP AI improvements