Updates to match Zyre
Cosmetic fixes
Added comment note