#625 ready
- reverted to previous config
- minor fix to events flow