I may be able to help with the PWS combined part. I looked at the code and I think this might be simple. In the Gateway code the variable for bundled sensors is "bundleSensors" however in the driver code the variable seems to be "isBundled". I used the driver one and changed the one in the gateway code. Unchecked and then re-checked bundle sensors and then did a resync....my PWS came back. I'm not going to say that is the ONLY thing that needs changed but maybe I helped a little.
and
Then a check off check on and a resync and the PWS was created
