Pointwatch - Capacity Chain addition
Merge pull request #825 from Windower/4.1

Various fixes
Merge pull request #826 from Windower/4.1-dev

Dev > Live merge