Zephyr fixes through 1:41 p.m.
All fixes through 2:39 p.m.
Final fixes and add -c helpers to acks