Edit/Update attempts and other improvements