Added edit event capability and some other small fixes