adjusted types in bindsetup, added props to event, cleanup