Fix Documentation

Fix links in documentation to point ot the real places.
Merge branch 'fix-doc'