Added On/Off and refactored the discover uPNP functionality a little bit