fixing issues with deletion and saving events