Logging improved, return updated object after edit.