Fixed links and minor details