#1 huge transitions and events fixes