Changed fee stuff to test, added UPNP support