added ability to configured advertised services and a little clean up