and event more fixes