a couple new ai modifications
Merge remote-tracking branch 'jon/master'