fixed wrong values and links