todo: updated
zt: various corrections