fix values and comments