changes to handle event signals
minor improvements