minor tweaks to recent Enumeration changes  and comments etc