- Prep work to fix effects duplication bug
- Fixed effects duplication bug
- Minor changes