Fixed some more for v.2.3.5

fixed softlocking near the end of the demo when you get kicked out of a bar and some text being cut off in battles.