looks better and links
fixed merge conflicts