zWave linked properties fix + minor tweaks