fixed stuff in event barrier still testing