Various conversation tweaks and bug fixes