zt: various changes