Further updates for AI and Unit Logic