fixing service discovery plus some cleanup and broken underscorespacing