Add link
Some fixes