Test event bubble fix
clean up event propagation fix
fix var rename
edit