Dev

Refine ws modes and time change events.