ZUMO: minor edits and review comments
Merge pull request #1198 from ggailey777/zumo_master

ZUMO: minor edits and review comments