edit is done and added a few more messages