Bug fixes and further exploration of dialog