Bug fixes, Added AI Change, and other changes