Could you add some more direct UPNP functionality to play around and test with? Manually opening and closing and enumerating UPNP?

Well. At least I won lunch.
Good philosophy, see good in bad, I like!