Vastly improved ZenPackGenerator output and minor tweaks