upgrades to pz core classes
Merge branch 'dev'