Added OAM enums for clearer code. Attempted to fix FR Bugs.