Dialogue improvements, bug fixes