various fixmes, mostly GoZID cleanup