Fixed Errors
Merge branch 'FinksNoMoreEnums'