Merge pull request #661 from nZEDb/dev

Dev
Merge pull request #662 from nZEDb/dev

Dev
Merge pull request #663 from nZEDb/dev

reverted to previous method for threads of incomple pp cats
Merge pull request #669 from nZEDb/dev

Dev
Merge pull request #670 from nZEDb/master

Master to dev