Fixes, still needs first phases on "event" passing