Fix issues with previous changes

This is to fix issues with changes that were merged previously as well as a minor removal of a dead link in the README.