fix error mesagges and add edit