Improvements/tweaks to AI and game control flow