Fixed the include/aicontroller mess
Removed some more temp files
Tuned some values