dialogue fixes
merged