- Updated atomics ep calls
- Minor re-org