Enum fixes
Merge pull request #1 from solmead/Working

Enum fixes