Better event system
Removed debug messages