Bug fixes and foundation for new master/slave dialogue system