adjust naming
event handling bettered
more event-oriented refactor