-Fix: Typo.
-Add: some more enum classes.
-Add: extra validation.