fixed ai errors
Merge branch 'dev'