ws fixed, events added