Fixed links
a few improvements :relaxed: