various small fixes and the fix on removal of discovered services