error handling improvements, generic events
clean brake
cleanup, all works