Bugs fixed like update and edit