Update with better descriptions and fixed link names