fix AI?
fix ai a little
Merge branch 'development'
Merging in Benny's changes
Modifications to merge in Benny's stuff
Merge yet again