Lots of updates to AI and UI