update with comments, value replace bugfix