AI Core polished up a bit