Small fixes for links and typos

Conflicts:

	README.md