Revert "Revert z16s changes"

This reverts commit 52e233ba10076bc4eafb2a36291a820a031eae6c.
Libs/Resources: Fix
PetTP: Fix
PetTP: Added safety features