Enums & Some Tweaks