Edit events + fixed authorization issues