Merged in old changes steve made. Also reverted most of the SsdpCollection things.