Fixed links, micro fixes