Event handerling

Saving fixed, data fixed, yaml fixed null handerling added