Final update. Fixed links