ZUMO: incorporate final set of Yavor items and other fixes
Merge pull request #1166 from ggailey777/zumo_master

ZUMO: incorporate final set of Yavor items and other fixes