more ZTK refactors