- some infrastructure Active Event logic
- cleaned up configuration parts