zt: various changes
Revert "zt: various changes"

This reverts commit f49bf63c43251c0454da131bbc83525025a435b9.
zt: mostly fixes