Changed enums to use NS_ENUM or NS_OPTIONS macros. closes #382