I've found more bugs to do with noncombat encounters. I don't know where they've come from, everything was working fine before. Working to fix them now.
