Upnp refactor - fixes, javadoc and junit stuff