ignore updates when returning original value from signal event handler, minor fixes