mostly cosmatic beside replacing the muncher with the one that doesn't throw exception
merging into Kees new update