changes in some configurations and scripts
refactoring in event handlers