added final comments and fix the saving a blank event issue
merging
merging