Fixed bonjour discovery and integrated and extended interactive UI

Hi James,
Thanks for starting this work. I have fixed and improved some stuff. May you find it helpful and want to integrate it.

Regards 
Chris