Add: a few minor changes and improvements to the implementation of enums.
Fix: various minor changes.