Typo
Enum in last part
Fix merge issue
Fix issues again