events fix + demo