So, I just started act III, and I moved on from getting knighted to going back to Crossroads Keep. I had bought all the upgrades possible in Act II before heading out to the haven, but when I get back Master Veedle is acting like I just met him and none of the upgrades have been done, which is weird because both the smiths are there, the merchant shop is built, and Deekin is in it. Similarly, Kana is acting like I just met her, and her report on the keep reflects absolutely nothing having been done. Katriona is in the room, but she doesn't show up on the sergeant roster.

I figure that this may be related to the bug where it doesn't even let you load crossroad keep, so I do what the wiki suggests and replace all the Crossroads keep files from the Act III save with the Crossroads keep files from the most recent pre-haven save. It doesn't do anything.

It gets even worse, when I go to leave crossroad keep, and the party selection menu is brought up, the roster is empty, none of the companions show up for me to add to the party. This is despite the fact that if I go in to the keep they're all standing around. I figure this might be because I replaced data in the save, so I load the quick save (which I didn't mess with), it still has all the same errors, including not showing any of my companions.

I've even tried reloading from the save I made right before entering the throne room to save Nasher. It didn't work.

Does anyone have any idea what's wrong with the game, and what I could do to fix this?