Update readme and fix event propagation issues