Some fixes!

:: Tidied up white space
:: Made upnp method protected so extension classes can be useful
:: Fixed bug with $next in AddURIToQueue