ZUMO: incorporate final set of Yavor items and other fixes