Fixed editentry many things
Fixed editentry many things